diff --git a/charts/enterprise/prometheus/Chart.yaml b/charts/enterprise/prometheus/Chart.yaml index d81fd79d565..be7adbe25d7 100644 --- a/charts/enterprise/prometheus/Chart.yaml +++ b/charts/enterprise/prometheus/Chart.yaml @@ -4,6 +4,14 @@ dependencies: - name: common repository: https://library-charts.truecharts.org version: 12.8.1 + - condition: exporters.enabled,exporters.node-exporter.enabled + name: node-exporter + repository: https://deps.truecharts.org + version: 1.0.1 + - condition: exporters.enabled,exporters.kube-state-metrics.enabled + name: kube-state-metrics + repository: https://deps.truecharts.org + version: 1.0.0 deprecated: false description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. icon: https://truecharts.org/img/hotlink-ok/chart-icons/prometheus.png @@ -21,7 +29,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 9.0.3 +version: 9.0.4 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/enterprise/prometheus/questions.yaml b/charts/enterprise/prometheus/questions.yaml index 9a62dab2f48..d8aefa04b48 100644 --- a/charts/enterprise/prometheus/questions.yaml +++ b/charts/enterprise/prometheus/questions.yaml @@ -23,6 +23,7 @@ questions: schema: type: string default: "info" + - variable: prometheus group: "App Configuration" label: "Prometheus Settings" @@ -79,6 +80,37 @@ questions: schema: type: boolean default: false + + - variable: exporters + group: "App Configuration" + label: "Exporter Settings" + schema: + additional_attrs: true + type: dict + attrs: + - variable: node-exporter + label: "node-exporter" + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: "Enable" + schema: + type: boolean + default: true + - variable: kube-state-metrics + label: "Kube-State-Metrics" + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: "Enable" + schema: + type: boolean + default: true + - variable: alertmanager group: "App Configuration" label: "Alertmanager Settings" @@ -151,7 +183,6 @@ questions: default: 10087 required: true # Include{serviceExpertRoot} - default: false # Include{serviceExpert} # Include{serviceList} # Include{persistenceList} diff --git a/charts/enterprise/prometheus/values.yaml b/charts/enterprise/prometheus/values.yaml index 478581b97c2..83d4638b30d 100644 --- a/charts/enterprise/prometheus/values.yaml +++ b/charts/enterprise/prometheus/values.yaml @@ -1129,37 +1129,14 @@ exporters: ## @param exporters.kube-state-metrics.enabled Enable kube-state-metrics ## enabled: true -## @param node-exporter [object] Node Exporter deployment configuration -## -node-exporter: - service: - port: 9910 - targetPort: 9910 - labels: - jobLabel: node-exporter - serviceMonitor: - enabled: true - jobLabel: jobLabel - extraArgs: - collector.filesystem.ignored-mount-points: "^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+|var/db/system/.+|mnt/[a-zA-Z0-9-_\\.]+/ix-applications/.+)($|/)" - collector.filesystem.ignored-fs-types: "^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$" - collector.netdev.device-exclude: "^veth.*$" - collector.netclass.ignored-devices: "^veth.*$" - path.rootfs: /host - extraVolumes: - - name: host - hostPath: - path: / - extraVolumeMounts: - - name: host - mountPath: /host - readOnly: true + ## @param kube-state-metrics [object] Node Exporter deployment configuration ## kube-state-metrics: serviceMonitor: enabled: true honorLabels: true + ## Component scraping for kubelet and kubelet hosted cAdvisor ## kubelet: