diff --git a/charts/frinx-machine-monitoring/Chart.yaml b/charts/frinx-machine-monitoring/Chart.yaml index c14e818c..87d32b9e 100644 --- a/charts/frinx-machine-monitoring/Chart.yaml +++ b/charts/frinx-machine-monitoring/Chart.yaml @@ -3,7 +3,7 @@ name: frinx-machine-monitoring description: A Helm chart for Kubernetes monitoring icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 type: application -version: 0.1.1 +version: 0.1.2 appVersion: "1.16.0" maintainers: - name: FRINX @@ -27,7 +27,7 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Update promtail configuration + description: Update names of prometheus components and change service monitor selector links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/420 + url: https://github.com/FRINXio/helm-charts/pull/427 diff --git a/charts/frinx-machine-monitoring/README.md b/charts/frinx-machine-monitoring/README.md index 6d10c06b..17aadf11 100644 --- a/charts/frinx-machine-monitoring/README.md +++ b/charts/frinx-machine-monitoring/README.md @@ -1,6 +1,6 @@ # frinx-machine-monitoring -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square) +![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square) A Helm chart for Kubernetes monitoring @@ -47,18 +47,18 @@ helm uninstall [RELEASE_NAME] | Key | Type | Default | Description | |-----|------|---------|-------------| -| kube-prometheus-stack | object | `{"crds":{"enabled":false},"enabled":true,"grafana":{"additionalDataSources":[{"access":"proxy","name":"Loki","type":"loki","url":"http://loki:3100"}],"adminPassword":"frinx123!","adminUser":"frinx","enabled":true,"fullnameOverride":"grafana","nodeExporter":{"operatingSystems":{"darwin":{"enabled":false}}},"sidecar":{"dashboards":{"folder":"/tmp/dashboards/Frinx-Machine","folderAnnotation":"grafana_folder","provider":{"allowUiUpdates":true,"foldersFromFilesStructure":true}}}},"prometheus":{"prometheusSpec":{"podMonitorSelector":{"matchExpressions":[{"key":"cnpg.io/cluster","operator":"In","values":["uniconfig-postgresql","postgresql"]}]},"serviceMonitorSelector":{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["frinx-machine","frinx-machine-monitoring","uniconfig","workflow-manager","oauth2-proxy"]}]}}}}` | Kube-prometheus-stack configuration | +| kube-prometheus-stack | object | `{"crds":{"enabled":false},"enabled":true,"fullnameOverride":"kube-prometheus-stack","grafana":{"additionalDataSources":[{"access":"proxy","name":"Loki","type":"loki","url":"http://loki:3100"}],"adminPassword":"frinx123!","adminUser":"frinx","enabled":true,"fullnameOverride":"grafana","sidecar":{"dashboards":{"folder":"/tmp/dashboards/Frinx-Machine","folderAnnotation":"grafana_folder","provider":{"allowUiUpdates":true,"foldersFromFilesStructure":true}}}},"kube-state-metrics":{"fullnameOverride":"prometheus-kube-state-metrics"},"nodeExporter":{"operatingSystems":{"darwin":{"enabled":false}}},"prometheus":{"fullnameOverride":"prometheus","prometheusSpec":{"podMonitorSelector":{"matchExpressions":[{"key":"cnpg.io/cluster","operator":"In","values":["uniconfig-postgresql","postgresql"]}]},"serviceMonitorSelector":{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ $.Release.Name }}","uniconfig","workflow-manager","resource-manager","oauth2-proxy"]}]}}},"prometheus-node-exporter":{"fullnameOverride":"prometheus-node-exporter"}}` | Kube-prometheus-stack configuration | | kube-prometheus-stack.crds | object | `{"enabled":false}` | CRDs for kube-prometheus-stack to be pulled and installed | -| kube-prometheus-stack.grafana | object | `{"additionalDataSources":[{"access":"proxy","name":"Loki","type":"loki","url":"http://loki:3100"}],"adminPassword":"frinx123!","adminUser":"frinx","enabled":true,"fullnameOverride":"grafana","nodeExporter":{"operatingSystems":{"darwin":{"enabled":false}}},"sidecar":{"dashboards":{"folder":"/tmp/dashboards/Frinx-Machine","folderAnnotation":"grafana_folder","provider":{"allowUiUpdates":true,"foldersFromFilesStructure":true}}}}` | Configure Grafana for visualisation | +| kube-prometheus-stack.grafana | object | `{"additionalDataSources":[{"access":"proxy","name":"Loki","type":"loki","url":"http://loki:3100"}],"adminPassword":"frinx123!","adminUser":"frinx","enabled":true,"fullnameOverride":"grafana","sidecar":{"dashboards":{"folder":"/tmp/dashboards/Frinx-Machine","folderAnnotation":"grafana_folder","provider":{"allowUiUpdates":true,"foldersFromFilesStructure":true}}}}` | Configure Grafana for visualisation | | kube-prometheus-stack.grafana.additionalDataSources | list | `[{"access":"proxy","name":"Loki","type":"loki","url":"http://loki:3100"}]` | Grafana additional datasource configurations Prometheus is defaultly set | -| kube-prometheus-stack.grafana.nodeExporter | object | `{"operatingSystems":{"darwin":{"enabled":false}}}` | NodeExporter deployment configuration | | kube-prometheus-stack.grafana.sidecar | object | `{"dashboards":{"folder":"/tmp/dashboards/Frinx-Machine","folderAnnotation":"grafana_folder","provider":{"allowUiUpdates":true,"foldersFromFilesStructure":true}}}` | Grafana sidecar configurations | | kube-prometheus-stack.grafana.sidecar.dashboards.folder | string | `"/tmp/dashboards/Frinx-Machine"` | Folder name for storing created and imported dashboards | | kube-prometheus-stack.grafana.sidecar.dashboards.folderAnnotation | string | `"grafana_folder"` | ConfigMap folder annotation for dashboard recognition | | kube-prometheus-stack.grafana.sidecar.dashboards.provider | object | `{"allowUiUpdates":true,"foldersFromFilesStructure":true}` | Provider settings | -| kube-prometheus-stack.prometheus | object | `{"prometheusSpec":{"podMonitorSelector":{"matchExpressions":[{"key":"cnpg.io/cluster","operator":"In","values":["uniconfig-postgresql","postgresql"]}]},"serviceMonitorSelector":{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["frinx-machine","frinx-machine-monitoring","uniconfig","workflow-manager","oauth2-proxy"]}]}}}` | Prometheus Operator configuration | +| kube-prometheus-stack.nodeExporter | object | `{"operatingSystems":{"darwin":{"enabled":false}}}` | NodeExporter deployment configuration | +| kube-prometheus-stack.prometheus | object | `{"fullnameOverride":"prometheus","prometheusSpec":{"podMonitorSelector":{"matchExpressions":[{"key":"cnpg.io/cluster","operator":"In","values":["uniconfig-postgresql","postgresql"]}]},"serviceMonitorSelector":{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ $.Release.Name }}","uniconfig","workflow-manager","resource-manager","oauth2-proxy"]}]}}}` | Prometheus Operator configuration | | kube-prometheus-stack.prometheus.prometheusSpec.podMonitorSelector | object | `{"matchExpressions":[{"key":"cnpg.io/cluster","operator":"In","values":["uniconfig-postgresql","postgresql"]}]}` | Selection of pod monitors to be discovered and scraped by Prometheus | -| kube-prometheus-stack.prometheus.prometheusSpec.serviceMonitorSelector | object | `{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["frinx-machine","frinx-machine-monitoring","uniconfig","workflow-manager","oauth2-proxy"]}]}` | Selection of service monitors to be discovered and scraped by Prometheus | +| kube-prometheus-stack.prometheus.prometheusSpec.serviceMonitorSelector | object | `{"matchExpressions":[{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ $.Release.Name }}","uniconfig","workflow-manager","resource-manager","oauth2-proxy"]}]}` | Selection of service monitors to be discovered and scraped by Prometheus | | loki | object | `{"enabled":true,"fullnameOverride":"loki","loki":{"config":"chunk_store_config:\n max_look_back_period: 24h\ntable_manager:\n retention_deletes_enabled: false\n retention_period: 24h\n"}}` | Loki configurations | -| promtail | object | `{"config":{"clients":[{"url":"http://loki:3100/loki/api/v1/push"}],"snippets":{"pipelineStages":[{"cri":{}}]}},"fullnameOverride":"promtail"}` | Promtail configurations | +| promtail | object | `{"config":{"clients":[{"url":"http://loki:3100/loki/api/v1/push"}],"snippets":{"pipelineStages":[{"match":{"selector":"{container=\"uniconfig\"}","stages":[{"cri":{}},{"docker":{}},{"multiline":{"firstline":"^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{2}:\\d{2}.\\d{3}","max_lines":128,"max_wait_time":"3s"}},{"regex":{"expression":".*DeviceName:(?P[^\\t\\n\\f\\r ]+)"}},{"labels":{"deviceName":null}}]}}]}},"fullnameOverride":"promtail"}` | Promtail configurations | diff --git a/charts/frinx-machine-monitoring/values.yaml b/charts/frinx-machine-monitoring/values.yaml index 2d4cf6bd..8884b108 100644 --- a/charts/frinx-machine-monitoring/values.yaml +++ b/charts/frinx-machine-monitoring/values.yaml @@ -5,6 +5,7 @@ # -- Kube-prometheus-stack configuration kube-prometheus-stack: enabled: true + fullnameOverride: "kube-prometheus-stack" # -- CRDs for kube-prometheus-stack to be pulled and installed crds: enabled: false @@ -42,8 +43,15 @@ kube-prometheus-stack: darwin: enabled: false + prometheus-node-exporter: + fullnameOverride: "prometheus-node-exporter" + + kube-state-metrics: + fullnameOverride: "prometheus-kube-state-metrics" + # -- Prometheus Operator configuration prometheus: + fullnameOverride: "prometheus" prometheusSpec: # -- Selection of service monitors to be discovered and scraped by Prometheus serviceMonitorSelector: @@ -51,10 +59,10 @@ kube-prometheus-stack: - key: app.kubernetes.io/instance operator: In values: - - frinx-machine - - frinx-machine-monitoring + - "{{ $.Release.Name }}" - uniconfig - workflow-manager + - resource-manager - oauth2-proxy # -- Selection of pod monitors to be discovered and scraped by Prometheus