Merge branch 'main' of github.com:grafana/k8s-monitoring-helm into fe…

…at/alloy-rules

# Conflicts:
#	charts/k8s-monitoring/Chart.lock

charts/k8s-monitoring/Chart.lock

@@ -11,15 +11,12 @@ dependencies:
 - name: alloy
   repository: https://grafana.github.io/helm-charts
   version: 0.3.2
-- name: alloy
-  repository: https://grafana.github.io/helm-charts
-  version: 0.3.2
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 5.20.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.34.0
+  version: 4.36.0
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
   version: 12.0.0
@@ -29,5 +26,5 @@ dependencies:
 - name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
   version: 1.35.0
-digest: sha256:5cdbcb273ce1c65625de0b58465503498c18980df88de412bd4895451b3937bf
-generated: "2024-06-10T11:02:51.469871-04:00"
+digest: sha256:f3825dbd2fd01a9fdf8a731f4b2ec165d0f2f3c716e2435b41c1420b49dfee38
+generated: "2024-06-10T00:18:49.00492116Z"

charts/k8s-monitoring/Chart.yaml

@@ -42,7 +42,7 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.enabled
   - name: prometheus-node-exporter
-    version: 4.34.0
+    version: 4.36.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-node-exporter.enabled
   - name: prometheus-operator-crds

charts/k8s-monitoring/README.md

@@ -143,7 +143,7 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 | https://grafana.github.io/helm-charts | alloy-rules(alloy) | 0.3.2 |
 | https://opencost.github.io/opencost-helm-chart | opencost | 1.35.0 |
 | https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.20.0 |
-| https://prometheus-community.github.io/helm-charts | prometheus-node-exporter | 4.34.0 |
+| https://prometheus-community.github.io/helm-charts | prometheus-node-exporter | 4.36.0 |
 | https://prometheus-community.github.io/helm-charts | prometheus-operator-crds | 12.0.0 |
 | https://prometheus-community.github.io/helm-charts | prometheus-windows-exporter | 0.3.1 |
 <!-- markdownlint-enable no-bare-urls -->

charts/k8s-monitoring/docs/Troubleshooting.md

@@ -2,12 +2,26 @@
 
 This document contains some information about frequently encountered issues and how to resolve them.
 
--   [Troubleshooting](#troubleshooting)
-    -   [Instructions for specific Cluster platform providers](#instructions-for-specific-cluster-platform-providers)
+-   [General Tips](#general-tips)
+-   [Instructions for specific Cluster platform providers](#instructions-for-specific-cluster-platform-providers)
+-   [Frequently seen problems](#frequently-seen-problems)
     -   [CustomResourceDefinition conflicts](#customresourcedefinition-conflicts)
     -   [Pod log files in `/var/lib/docker/containers`](#pod-log-files-in-varlibdockercontainers)
     -   [Authentication error: invalid scope requested](#authentication-error-invalid-scope-requested)
 
+## General tips
+
+### Alloy Web UI
+
+Grafana Alloy has a
+[web user interface](https://grafana.com/docs/alloy/latest/tasks/debug/#alloy-ui) that shows every configuration
+component that Alloy instance is using and their statuses. By default, the web UI runs on each Alloy pod on port
+`12345`. Since that UI is typically not exposed external to the Cluster, you can use port-forwarding to access it.
+
+`kubectl port-forward svc/grafana-k8s-monitoring-alloy 12345:12345`
+
+Then open a browser to `http://localhost:12345`
+
 ## Instructions for specific Cluster platform providers
 
 Certain Kubernetes Cluster platforms require some specific configurations for this Helm chart. If your Cluster is
@@ -18,7 +32,9 @@ running on one of these platforms, see the example for the changes required to r
 -   [IBM Cloud](../../../examples/ibm-cloud)
 -   [OpenShift](../../../examples/openshift-compatible)
 
-## CustomResourceDefinition conflicts
+## Frequently seen problems
+
+### CustomResourceDefinition conflicts
 
 The Kubernetes Monitoring chart deploys
 the [Prometheus Operator custom resource definitions](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-operator-crds)
@@ -40,7 +56,7 @@ To fix this problem, you can either:
       enabled: false
     ```
 
-## Pod log files in `/var/lib/docker/containers`
+### Pod log files in `/var/lib/docker/containers`
 
 On certain Kubernetes Clusters, Pod logs are stored inside of `/var/lib/docker/containers` with `/var/log/pods` being
 symlinked to that directory, but the Grafana Alloy instance doesn't mount it by default.
@@ -61,7 +77,7 @@ alloy-logs:
 
 ([source](https://github.com/grafana/k8s-monitoring-helm/issues/309))
 
-## Authentication error: invalid scope requested
+### Authentication error: invalid scope requested
 
 To deliver telemetry data to Grafana Cloud, you use
 an [Access Policy Token](https://grafana.com/docs/grafana-cloud/account-management/authentication-and-permissions/access-policies/)