forked from RemoteSync/grafana-meta-monitoring-chart
Compare commits
16 Commits
add_loki_t
...
v1.2.0
Author | SHA1 | Date | |
---|---|---|---|
|
9a3d0b51d8 | ||
|
df38407fb3 | ||
|
0914919499 | ||
|
918b6b9cb4 | ||
|
55f3424118 | ||
|
98e5ecd887 | ||
|
58b438cdb5 | ||
|
c4af598b75 | ||
|
c78fe2d9fa | ||
|
bae6e28b51 | ||
|
8f38e9508f | ||
|
de8a87dea1 | ||
|
48fad9f387 | ||
|
4ec5f08646 | ||
|
a1b66f0cd4 | ||
|
34bbe47d75 |
@@ -1,18 +1,18 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
- name: loki
|
- name: loki
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 6.5.2
|
version: 6.6.2
|
||||||
- name: alloy
|
- name: alloy
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 0.3.0
|
version: 0.9.2
|
||||||
- name: mimir-distributed
|
- name: mimir-distributed
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 5.3.0
|
version: 5.3.0
|
||||||
- name: tempo-distributed
|
- name: tempo-distributed
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 1.9.9
|
version: 1.10.0
|
||||||
- name: minio
|
- name: minio
|
||||||
repository: https://charts.min.io
|
repository: https://charts.min.io
|
||||||
version: 5.2.0
|
version: 5.2.0
|
||||||
digest: sha256:0eaa504de24724505fa4fff5169cd86628465ec366c253392c4ed24f15902b6b
|
digest: sha256:f9db8c14f253abf3dda0e1828db974daa76e6fbc4ae8c8b59b22ae8ac80134f0
|
||||||
generated: "2024-05-22T07:02:54.054326052Z"
|
generated: "2024-10-24T12:16:53.621381279-04:00"
|
||||||
|
@@ -13,7 +13,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 1.0.0
|
version: 1.2.0
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
@@ -22,18 +22,18 @@ appVersion: "0.0.1"
|
|||||||
dependencies:
|
dependencies:
|
||||||
- name: loki
|
- name: loki
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 6.5.2
|
version: 6.6.2
|
||||||
condition: local.logs.enabled
|
condition: local.logs.enabled
|
||||||
- name: alloy
|
- name: alloy
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 0.3.0
|
version: 0.9.2
|
||||||
- name: mimir-distributed
|
- name: mimir-distributed
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 5.3.0
|
version: 5.3.0
|
||||||
condition: local.metrics.enabled
|
condition: local.metrics.enabled
|
||||||
- name: tempo-distributed
|
- name: tempo-distributed
|
||||||
repository: https://grafana.github.io/helm-charts
|
repository: https://grafana.github.io/helm-charts
|
||||||
version: 1.9.9
|
version: 1.10.0
|
||||||
condition: local.traces.enabled
|
condition: local.traces.enabled
|
||||||
- name: minio
|
- name: minio
|
||||||
repository: https://charts.min.io
|
repository: https://charts.min.io
|
||||||
|
Binary file not shown.
BIN
charts/meta-monitoring/charts/alloy-0.9.2.tgz
Normal file
BIN
charts/meta-monitoring/charts/alloy-0.9.2.tgz
Normal file
Binary file not shown.
Binary file not shown.
BIN
charts/meta-monitoring/charts/loki-6.6.2.tgz
Normal file
BIN
charts/meta-monitoring/charts/loki-6.6.2.tgz
Normal file
Binary file not shown.
BIN
charts/meta-monitoring/charts/tempo-distributed-1.10.0.tgz
Normal file
BIN
charts/meta-monitoring/charts/tempo-distributed-1.10.0.tgz
Normal file
Binary file not shown.
Binary file not shown.
@@ -2449,7 +2449,7 @@
|
|||||||
"repeatIteration": null,
|
"repeatIteration": null,
|
||||||
"repeatRowId": null,
|
"repeatRowId": null,
|
||||||
"showTitle": true,
|
"showTitle": true,
|
||||||
"title": "TSBD Index",
|
"title": "TSDB Index",
|
||||||
"titleSize": "h6"
|
"titleSize": "h6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@@ -120,9 +120,9 @@ data:
|
|||||||
replacement = "{{- .Values.clusterLabelValue -}}"
|
replacement = "{{- .Values.clusterLabelValue -}}"
|
||||||
}
|
}
|
||||||
rule {
|
rule {
|
||||||
source_labels = ["__meta_kubernetes_pod_container_port_number"]
|
source_labels = ["__meta_kubernetes_pod_container_port_name"]
|
||||||
action = "drop"
|
action = "keep"
|
||||||
regex = "9095"
|
regex = ".*metrics.*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,133 +155,7 @@ data:
|
|||||||
|
|
||||||
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
|
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
|
||||||
}
|
}
|
||||||
{{- if .Values.kubeStateMetrics.enabled }}
|
|
||||||
|
|
||||||
prometheus.scrape "kubeStateMetrics" {
|
|
||||||
clustering {
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
targets = [ { "__address__" = "{{ .Values.kubeStateMetrics.endpoint }}" } ]
|
|
||||||
forward_to = [ prometheus.relabel.filter.receiver ]
|
|
||||||
}
|
|
||||||
{{- end }}
|
|
||||||
|
|
||||||
// cAdvisor and Kubelet metrics
|
|
||||||
// Based on https://github.com/Chewie/loutretelecom-manifests/blob/main/manifests/addons/monitoring/config.river
|
|
||||||
discovery.kubernetes "all_nodes" {
|
|
||||||
role = "node"
|
|
||||||
namespaces {
|
|
||||||
own_namespace = true
|
|
||||||
names = [ {{ include "agent.namespaces" . }} ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
discovery.relabel "all_nodes" {
|
|
||||||
targets = discovery.kubernetes.all_nodes.targets
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_node_name"]
|
|
||||||
target_label = "node"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_namespace"]
|
|
||||||
target_label = "namespace"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_pod_name"]
|
|
||||||
target_label = "pod"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_namespace", "__meta_kubernetes_pod_label_app_kubernetes_io_name", "__meta_kubernetes_pod_label_app_kubernetes_io_component"]
|
|
||||||
separator = "/"
|
|
||||||
regex = "(.*)/(.*)/(.*)"
|
|
||||||
replacement = "${1}/${2}-${3}"
|
|
||||||
target_label = "job"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
target_label = "cluster"
|
|
||||||
replacement = "{{- .Values.clusterLabelValue -}}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
prometheus.scrape "cadvisor" {
|
|
||||||
clustering {
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
targets = discovery.relabel.all_nodes.output
|
|
||||||
forward_to = [ prometheus.relabel.filter.receiver ]
|
|
||||||
|
|
||||||
metrics_path = "/metrics/cadvisor"
|
|
||||||
scheme = "https"
|
|
||||||
|
|
||||||
bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token"
|
|
||||||
tls_config {
|
|
||||||
ca_file = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
prometheus.scrape "kubelet" {
|
|
||||||
clustering {
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
targets = discovery.relabel.all_nodes.output
|
|
||||||
forward_to = [ prometheus.relabel.filter.receiver ]
|
|
||||||
|
|
||||||
metrics_path = "/metrics"
|
|
||||||
scheme = "https"
|
|
||||||
|
|
||||||
bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token"
|
|
||||||
tls_config {
|
|
||||||
ca_file = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
prometheus.exporter.unix "promexporter" {}
|
|
||||||
|
|
||||||
prometheus.scrape "node_exporter" {
|
|
||||||
clustering {
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
targets = prometheus.exporter.unix.promexporter.targets
|
|
||||||
forward_to = [prometheus.relabel.node_exporter.receiver]
|
|
||||||
|
|
||||||
job_name = "node-exporter"
|
|
||||||
}
|
|
||||||
|
|
||||||
prometheus.relabel "node_exporter" {
|
|
||||||
forward_to = [ prometheus.relabel.filter.receiver ]
|
|
||||||
|
|
||||||
rule {
|
|
||||||
replacement = env("HOSTNAME")
|
|
||||||
target_label = "nodename"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
replacement = "node-exporter"
|
|
||||||
target_label = "job"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_node_name"]
|
|
||||||
target_label = "node"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_namespace"]
|
|
||||||
target_label = "namespace"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_pod_name"]
|
|
||||||
target_label = "pod"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
source_labels = ["__meta_kubernetes_namespace", "__meta_kubernetes_pod_label_app_kubernetes_io_name", "__meta_kubernetes_pod_label_app_kubernetes_io_component"]
|
|
||||||
separator = "/"
|
|
||||||
regex = "(.*)/(.*)/(.*)"
|
|
||||||
replacement = "${1}/${2}-${3}"
|
|
||||||
target_label = "job"
|
|
||||||
}
|
|
||||||
rule {
|
|
||||||
target_label = "cluster"
|
|
||||||
replacement = "{{- .Values.clusterLabelValue -}}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- if or .Values.local.traces.enabled .Values.cloud.traces.enabled }}
|
{{- if or .Values.local.traces.enabled .Values.cloud.traces.enabled }}
|
||||||
|
@@ -66,9 +66,11 @@ logs:
|
|||||||
# The lines matching these will be kept in Loki
|
# The lines matching these will be kept in Loki
|
||||||
retain:
|
retain:
|
||||||
# This shows the queries
|
# This shows the queries
|
||||||
|
- executing query
|
||||||
- caller=metrics.go
|
- caller=metrics.go
|
||||||
# This shows any errors
|
# This shows any errors
|
||||||
- level=error
|
- level=error
|
||||||
|
- level=warn
|
||||||
# Log lines for delete requests
|
# Log lines for delete requests
|
||||||
- delete request for user added
|
- delete request for user added
|
||||||
- Started processing delete request
|
- Started processing delete request
|
||||||
|
Reference in New Issue
Block a user