andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1786 from aiyengar2/move_rancher_service_metrics_to_main_chart 

Move rancherServiceMetrics into main chart
pull/1798/head
Arvind Iyengar 2022-03-08 16:45:19 -08:00 committed by GitHub
parent 3a9e6783fa fd6aee7aaf
commit 792b58bc29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 129 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/rancher-monitoring/rancher-monitoring-100.1.1+up19.0.3.tgz
View File

Binary file not shown.

3
charts/rancher-monitoring/100.1.1+up19.0.3/Chart.yaml
View File

@ -56,9 +56,6 @@ dependencies:
- condition: nodeExporter.enabled - condition: nodeExporter.enabled
name: prometheus-node-exporter name: prometheus-node-exporter
repository: file://./charts/prometheus-node-exporter repository: file://./charts/prometheus-node-exporter
- condition: rancherServiceMetrics.enabled
name: rancherServiceMetrics
repository: file://./charts/rancherServiceMetrics
- condition: rke2ControllerManager.enabled - condition: rke2ControllerManager.enabled
name: rke2ControllerManager name: rke2ControllerManager
repository: file://./charts/rke2ControllerManager repository: file://./charts/rke2ControllerManager

11
charts/rancher-monitoring/100.1.1+up19.0.3/charts/rancherServiceMetrics/Chart.yaml
View File

@ -1,11 +0,0 @@
annotations:
catalog.cattle.io/hidden: "true"
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: cattle-monitoring-system
catalog.rancher.io/release-name: rancher-service-metrics
apiVersion: v1
appVersion: 0.0.1
description: Scrapes service metrics for Rancher
name: rancherServiceMetrics
type: application
version: 0.1.0

1
charts/rancher-monitoring/100.1.1+up19.0.3/charts/rancherServiceMetrics/values.yaml
View File

@ -1 +0,0 @@
chartLabel: ""

14
charts/rancher-monitoring/100.1.1+up19.0.3/templates/_helpers.tpl
View File

@ -101,6 +101,20 @@ kubelet
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- define "rancher.serviceMonitor.selector" -}}
{{- if .Values.rancherMonitoring.selector }}
{{ .Values.rancherMonitoring.selector | toYaml }}
{{- else }}
{{- $rancherDeployment := (lookup "apps/v1" "Deployment" "cattle-system" "rancher") }}
{{- if $rancherDeployment }}
matchLabels:
app: rancher
chart: {{ index $rancherDeployment.metadata.labels "chart" }}
release: rancher
{{- end }}
{{- end }}
{{- end }}
# Windows Support # Windows Support
{{/* {{/*

3
charts/rancher-monitoring/100.1.1+up19.0.3/templates/rancher-monitoring/dashboards/rancher/performance-dashboards.yaml
View File

@ -1,4 +1,5 @@
{{- if and .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.rancherServiceMetrics.enabled }} {{- $selector := (include "rancher.serviceMonitor.selector" .) -}}
{{- if and .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.rancherMonitoring.enabled $selector }}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:

35
packages/rancher-monitoring/rancher-service-metrics/charts/templates/servicemonitor.yaml → charts/rancher-monitoring/100.1.1+up19.0.3/templates/rancher-monitoring/exporters/rancher/servicemonitor.yaml
View File

@ -1,16 +1,9 @@
{{- $chartLabel := .Values.chartLabel }} {{- $selector := (include "rancher.serviceMonitor.selector" .) -}}
{{- if eq $chartLabel "" }} {{- if and .Values.rancherMonitoring.enabled $selector }}
{{- $rancherDeployment := (lookup "apps/v1" "Deployment" "cattle-system" "rancher") }}
{{- if $rancherDeployment }}
{{- $chartLabel = (index $rancherDeployment.metadata.labels "chart") }}
{{- end }}
{{- end }}
{{- if ne $chartLabel "" }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
labels: labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }}
{{ include "kube-prometheus-stack.labels" . | indent 4 }}
name: rancher name: rancher
namespace: cattle-system namespace: cattle-system
spec: spec:
@ -22,19 +15,15 @@ spec:
insecureSkipVerify: true insecureSkipVerify: true
serverName: rancher serverName: rancher
jobLabel: rancher jobLabel: rancher
namespaceSelector: {{- if .Values.rancherMonitoring.namespaceSelector }}
matchNames: namespaceSelector: {{ .Values.rancherMonitoring.namespaceSelector | toYaml | nindent 4 }}
- cattle-system {{- end }}
selector: selector: {{ include "rancher.serviceMonitor.selector" . | nindent 4 }}
matchLabels:
app: rancher
chart: {{ $chartLabel }}
release: rancher
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: rancher-monitoring-metrics-view name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
rules: rules:
- apiGroups: - apiGroups:
- management.cattle.io - management.cattle.io
@ -46,13 +35,13 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: rancher-monitoring-operator-metrics name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: rancher-monitoring-metrics-view name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: rancher-monitoring-prometheus name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus
namespace: cattle-monitoring-system namespace: {{ template "kube-prometheus-stack.namespace" . }}
{{- end }} {{- end }}

18
charts/rancher-monitoring/100.1.1+up19.0.3/values.yaml
View File

@ -415,6 +415,24 @@ hardenedNodeExporter:
- effect: "NoSchedule" - effect: "NoSchedule"
operator: "Exists" operator: "Exists"
## Rancher Monitoring
##
rancherMonitoring:
enabled: true
## A namespaceSelector to identify the namespace to find the Rancher deployment
##
namespaceSelector:
matchNames:
- cattle-system
## A selector to identify the Rancher deployment
## If not set, the chart will try to search for the Rancher deployment in the cattle-system namespace and infer the selector values from it
## If the Rancher deployment does not exist, no resources will be deployed.
##
selector: {}
## Component scraping nginx-ingress-controller ## Component scraping nginx-ingress-controller
## ##
ingressNginx: ingressNginx:

7
index.yaml
View File

@ -4863,7 +4863,7 @@ entries:
catalog.cattle.io/upstream-version: 19.0.3 catalog.cattle.io/upstream-version: 19.0.3
apiVersion: v2 apiVersion: v2
appVersion: 0.50.0 appVersion: 0.50.0
created: "2022-03-03T22:12:28.402589+01:00" created: "2022-03-08T15:43:39.956164-08:00"
dependencies: dependencies:
- condition: grafana.enabled - condition: grafana.enabled
name: grafana name: grafana
@ -4898,9 +4898,6 @@ entries:
- condition: nodeExporter.enabled - condition: nodeExporter.enabled
name: prometheus-node-exporter name: prometheus-node-exporter
repository: file://./charts/prometheus-node-exporter repository: file://./charts/prometheus-node-exporter
- condition: rancherServiceMetrics.enabled
name: rancherServiceMetrics
repository: file://./charts/rancherServiceMetrics
- condition: rke2ControllerManager.enabled - condition: rke2ControllerManager.enabled
name: rke2ControllerManager name: rke2ControllerManager
repository: file://./charts/rke2ControllerManager repository: file://./charts/rke2ControllerManager
@ -4937,7 +4934,7 @@ entries:
description: Collects several related Helm charts, Grafana dashboards, and Prometheus description: Collects several related Helm charts, Grafana dashboards, and Prometheus
rules combined with documentation and scripts to provide easy to operate end-to-end rules combined with documentation and scripts to provide easy to operate end-to-end
Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
digest: f9665bde50858b6e8c9a6be86a143be79c4127267ba4130fd86c0e74abdc176b digest: 4b0d80cf6308e191aa8f8d6d6d28a86996d6defa84d6b65143e64de6b8202f61
home: https://github.com/prometheus-operator/kube-prometheus home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords: keywords:

2
packages/rancher-monitoring/rancher-monitoring/generated-changes/dependencies/rancherServiceMetrics/dependency.yaml
View File

@ -1,2 +0,0 @@
workingDir: ""
url: packages/rancher-monitoring/rancher-service-metrics

3
packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/dashboards/rancher/performance-dashboards.yaml
View File

@ -1,4 +1,5 @@
{{- if and .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.rancherServiceMetrics.enabled }} {{- $selector := (include "rancher.serviceMonitor.selector" .) -}}
{{- if and .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.rancherMonitoring.enabled $selector }}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:

35
charts/rancher-monitoring/100.1.1+up19.0.3/charts/rancherServiceMetrics/templates/servicemonitor.yaml → packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/exporters/rancher/servicemonitor.yaml
View File

@ -1,16 +1,9 @@
{{- $chartLabel := .Values.chartLabel }} {{- $selector := (include "rancher.serviceMonitor.selector" .) -}}
{{- if eq $chartLabel "" }} {{- if and .Values.rancherMonitoring.enabled $selector }}
{{- $rancherDeployment := (lookup "apps/v1" "Deployment" "cattle-system" "rancher") }}
{{- if $rancherDeployment }}
{{- $chartLabel = (index $rancherDeployment.metadata.labels "chart") }}
{{- end }}
{{- end }}
{{- if ne $chartLabel "" }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
labels: labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }}
{{ include "kube-prometheus-stack.labels" . | indent 4 }}
name: rancher name: rancher
namespace: cattle-system namespace: cattle-system
spec: spec:
@ -22,19 +15,15 @@ spec:
insecureSkipVerify: true insecureSkipVerify: true
serverName: rancher serverName: rancher
jobLabel: rancher jobLabel: rancher
namespaceSelector: {{- if .Values.rancherMonitoring.namespaceSelector }}
matchNames: namespaceSelector: {{ .Values.rancherMonitoring.namespaceSelector | toYaml | nindent 4 }}
- cattle-system {{- end }}
selector: selector: {{ include "rancher.serviceMonitor.selector" . | nindent 4 }}
matchLabels:
app: rancher
chart: {{ $chartLabel }}
release: rancher
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: rancher-monitoring-metrics-view name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
rules: rules:
- apiGroups: - apiGroups:
- management.cattle.io - management.cattle.io
@ -46,13 +35,13 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: rancher-monitoring-operator-metrics name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: rancher-monitoring-metrics-view name: {{ template "kube-prometheus-stack.fullname" . }}-rancher-metrics
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: rancher-monitoring-prometheus name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus
namespace: cattle-monitoring-system namespace: {{ template "kube-prometheus-stack.namespace" . }}
{{- end }} {{- end }}

4
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch
View File

@ -22,7 +22,7 @@
apiVersion: v2 apiVersion: v2
appVersion: 0.50.0 appVersion: 0.50.0
dependencies: dependencies:
@@ -74,19 +89,19 @@ @@ -71,19 +86,19 @@
- condition: rkeScheduler.enabled - condition: rkeScheduler.enabled
name: rkeScheduler name: rkeScheduler
repository: file://./charts/rkeScheduler repository: file://./charts/rkeScheduler
@ -47,7 +47,7 @@
kubeVersion: '>=1.16.0-0' kubeVersion: '>=1.16.0-0'
maintainers: maintainers:
- name: vsliouniaev - name: vsliouniaev
@@ -99,7 +114,12 @@ @@ -96,7 +111,12 @@
name: scottrigby name: scottrigby
- email: miroslav.hadzhiev@gmail.com - email: miroslav.hadzhiev@gmail.com
name: Xtigyro name: Xtigyro

18
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/_helpers.tpl --- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl +++ charts/templates/_helpers.tpl
@@ -1,3 +1,130 @@ @@ -1,3 +1,144 @@
+# Rancher +# Rancher
+{{- define "system_default_registry" -}} +{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}}
@ -104,6 +104,20 @@
+{{- end -}} +{{- end -}}
+{{- end }} +{{- end }}
+ +
+{{- define "rancher.serviceMonitor.selector" -}}
+{{- if .Values.rancherMonitoring.selector }}
+{{ .Values.rancherMonitoring.selector | toYaml }}
+{{- else }}
+{{- $rancherDeployment := (lookup "apps/v1" "Deployment" "cattle-system" "rancher") }}
+{{- if $rancherDeployment }}
+matchLabels:
+ app: rancher
+ chart: {{ index $rancherDeployment.metadata.labels "chart" }}
+ release: rancher
+{{- end }}
+{{- end }}
+{{- end }}
+
+# Windows Support +# Windows Support
+ +
+{{/* +{{/*
@ -131,7 +145,7 @@
{{/* vim: set filetype=mustache: */}} {{/* vim: set filetype=mustache: */}}
{{/* Expand the name of the chart. This is suffixed with -alertmanager, which means subtract 13 from longest 63 available */}} {{/* Expand the name of the chart. This is suffixed with -alertmanager, which means subtract 13 from longest 63 available */}}
{{- define "kube-prometheus-stack.name" -}} {{- define "kube-prometheus-stack.name" -}}
@@ -48,7 +175,7 @@ @@ -48,7 +189,7 @@
{{- define "kube-prometheus-stack.labels" }} {{- define "kube-prometheus-stack.labels" }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}

80
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml --- charts-original/values.yaml
+++ charts/values.yaml +++ charts/values.yaml
@@ -2,13 +2,470 @@ @@ -2,13 +2,488 @@
# This is a YAML-formatted file. # This is a YAML-formatted file.
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
@ -417,6 +417,24 @@
+ - effect: "NoSchedule" + - effect: "NoSchedule"
+ operator: "Exists" + operator: "Exists"
+ +
+## Rancher Monitoring
+##
+
+rancherMonitoring:
+ enabled: true
+
+ ## A namespaceSelector to identify the namespace to find the Rancher deployment
+ ##
+ namespaceSelector:
+ matchNames:
+ - cattle-system
+
+ ## A selector to identify the Rancher deployment
+ ## If not set, the chart will try to search for the Rancher deployment in the cattle-system namespace and infer the selector values from it
+ ## If the Rancher deployment does not exist, no resources will be deployed.
+ ##
+ selector: {}
+
+## Component scraping nginx-ingress-controller +## Component scraping nginx-ingress-controller
+## +##
+ingressNginx: +ingressNginx:
@ -473,7 +491,7 @@
## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6 ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
## ##
@@ -93,8 +550,34 @@ @@ -93,8 +568,34 @@
## ##
global: global:
@ -508,7 +526,7 @@
pspEnabled: true pspEnabled: true
pspAnnotations: {} pspAnnotations: {}
## Specify pod annotations ## Specify pod annotations
@@ -187,25 +670,77 @@ @@ -187,25 +688,77 @@
## ref: https://prometheus.io/docs/alerting/notifications/ ## ref: https://prometheus.io/docs/alerting/notifications/
## https://prometheus.io/docs/alerting/notification_examples/ ## https://prometheus.io/docs/alerting/notification_examples/
## ##
@ -605,7 +623,7 @@
ingress: ingress:
enabled: false enabled: false
@@ -397,7 +932,7 @@ @@ -397,7 +950,7 @@
## Image of Alertmanager ## Image of Alertmanager
## ##
image: image:
@ -614,7 +632,7 @@
tag: v0.22.2 tag: v0.22.2
sha: "" sha: ""
@@ -509,9 +1044,13 @@ @@ -509,9 +1062,13 @@
## Define resources requests and limits for single Pods. ## Define resources requests and limits for single Pods.
## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
## ##
@ -631,7 +649,7 @@
## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node. ## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node.
## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided. ## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided.
@@ -625,6 +1164,30 @@ @@ -625,6 +1182,30 @@
enabled: true enabled: true
namespaceOverride: "" namespaceOverride: ""
@ -662,7 +680,7 @@
## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
## ##
forceDeployDatasources: false forceDeployDatasources: false
@@ -637,6 +1200,18 @@ @@ -637,6 +1218,18 @@
## ##
defaultDashboardsEnabled: true defaultDashboardsEnabled: true
@ -681,7 +699,7 @@
## Timezone for the default dashboards ## Timezone for the default dashboards
## Other options are: browser or a specific timezone, i.e. Europe/Luxembourg ## Other options are: browser or a specific timezone, i.e. Europe/Luxembourg
## ##
@@ -681,6 +1256,7 @@ @@ -681,6 +1274,7 @@
dashboards: dashboards:
enabled: true enabled: true
label: grafana_dashboard label: grafana_dashboard
@ -689,7 +707,7 @@
## Annotations for Grafana dashboard configmaps ## Annotations for Grafana dashboard configmaps
## ##
@@ -739,7 +1315,60 @@ @@ -739,7 +1333,60 @@
## Passed to grafana subchart and used by servicemonitor below ## Passed to grafana subchart and used by servicemonitor below
## ##
service: service:
@ -751,7 +769,7 @@
## If true, create a serviceMonitor for grafana ## If true, create a serviceMonitor for grafana
## ##
@@ -773,6 +1402,17 @@ @@ -773,6 +1420,17 @@
# replacement: $1 # replacement: $1
# action: replace # action: replace
@ -769,7 +787,7 @@
## Component scraping the kube api server ## Component scraping the kube api server
## ##
kubeApiServer: kubeApiServer:
@@ -952,7 +1592,7 @@ @@ -952,7 +1610,7 @@
## Component scraping the kube controller manager ## Component scraping the kube controller manager
## ##
kubeControllerManager: kubeControllerManager:
@ -778,7 +796,7 @@
## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on
## ##
@@ -1110,7 +1750,7 @@ @@ -1110,7 +1768,7 @@
## Component scraping etcd ## Component scraping etcd
## ##
kubeEtcd: kubeEtcd:
@ -787,7 +805,7 @@
## If your etcd is not deployed as a pod, specify IPs it can be found on ## If your etcd is not deployed as a pod, specify IPs it can be found on
## ##
@@ -1177,7 +1817,7 @@ @@ -1177,7 +1835,7 @@
## Component scraping kube scheduler ## Component scraping kube scheduler
## ##
kubeScheduler: kubeScheduler:
@ -796,7 +814,7 @@
## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on
## ##
@@ -1237,7 +1877,7 @@ @@ -1237,7 +1895,7 @@
## Component scraping kube proxy ## Component scraping kube proxy
## ##
kubeProxy: kubeProxy:
@ -805,7 +823,7 @@
## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## If your kube proxy is not deployed as a pod, specify IPs it can be found on
## ##
@@ -1337,6 +1977,13 @@ @@ -1337,6 +1995,13 @@
create: true create: true
podSecurityPolicy: podSecurityPolicy:
enabled: true enabled: true
@ -819,7 +837,7 @@
## Deploy node exporter as a daemonset to all nodes ## Deploy node exporter as a daemonset to all nodes
## ##
@@ -1392,6 +2039,16 @@ @@ -1392,6 +2057,16 @@
extraArgs: extraArgs:
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/) - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/)
- --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$
@ -836,7 +854,7 @@
## Manages Prometheus and Alertmanager components ## Manages Prometheus and Alertmanager components
## ##
@@ -1404,8 +2061,8 @@ @@ -1404,8 +2079,8 @@
enabled: true enabled: true
# Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants
tlsMinVersion: VersionTLS13 tlsMinVersion: VersionTLS13
@ -847,7 +865,7 @@
## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted
## rules from making their way into prometheus and potentially preventing the container from starting ## rules from making their way into prometheus and potentially preventing the container from starting
@@ -1422,9 +2079,9 @@ @@ -1422,9 +2097,9 @@
patch: patch:
enabled: true enabled: true
image: image:
@ -859,7 +877,7 @@
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
## Provide a priority class name to the webhook patching job ## Provide a priority class name to the webhook patching job
@@ -1571,13 +2228,13 @@ @@ -1571,13 +2246,13 @@
## Resource limits & requests ## Resource limits & requests
## ##
@ -880,7 +898,7 @@
# Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico), # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico),
# because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working
@@ -1630,7 +2287,7 @@ @@ -1630,7 +2305,7 @@
## Prometheus-operator image ## Prometheus-operator image
## ##
image: image:
@ -889,7 +907,7 @@
tag: v0.50.0 tag: v0.50.0
sha: "" sha: ""
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
@@ -1646,7 +2303,7 @@ @@ -1646,7 +2321,7 @@
## Prometheus-config-reloader image to use for config and rule reloading ## Prometheus-config-reloader image to use for config and rule reloading
## ##
prometheusConfigReloaderImage: prometheusConfigReloaderImage:
@ -898,7 +916,7 @@
tag: v0.50.0 tag: v0.50.0
sha: "" sha: ""
@@ -1661,7 +2318,7 @@ @@ -1661,7 +2336,7 @@
## Thanos side-car image when configured ## Thanos side-car image when configured
## ##
thanosImage: thanosImage:
@ -907,7 +925,7 @@
tag: v0.17.2 tag: v0.17.2
sha: "" sha: ""
@@ -1781,7 +2438,7 @@ @@ -1781,7 +2456,7 @@
port: 9090 port: 9090
## To be used with a proxy extraContainer port ## To be used with a proxy extraContainer port
@ -916,7 +934,7 @@
## List of IP addresses at which the Prometheus server service is available ## List of IP addresses at which the Prometheus server service is available
## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
@@ -2054,7 +2711,7 @@ @@ -2054,7 +2729,7 @@
## Image of Prometheus. ## Image of Prometheus.
## ##
image: image:
@ -925,7 +943,7 @@
tag: v2.28.1 tag: v2.28.1
sha: "" sha: ""
@@ -2149,7 +2806,7 @@ @@ -2149,7 +2824,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment, ## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the PrometheusRule resources created ## which will also match the PrometheusRule resources created
## ##
@ -934,7 +952,7 @@
## PrometheusRules to be selected for target discovery. ## PrometheusRules to be selected for target discovery.
## If {}, select all PrometheusRules ## If {}, select all PrometheusRules
@@ -2174,7 +2831,7 @@ @@ -2174,7 +2849,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment, ## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the servicemonitors created ## which will also match the servicemonitors created
## ##
@ -943,7 +961,7 @@
## ServiceMonitors to be selected for target discovery. ## ServiceMonitors to be selected for target discovery.
## If {}, select all ServiceMonitors ## If {}, select all ServiceMonitors
@@ -2197,7 +2854,7 @@ @@ -2197,7 +2872,7 @@
## prometheus resource to be created with selectors based on values in the helm deployment, ## prometheus resource to be created with selectors based on values in the helm deployment,
## which will also match the podmonitors created ## which will also match the podmonitors created
## ##
@ -952,7 +970,7 @@
## PodMonitors to be selected for target discovery. ## PodMonitors to be selected for target discovery.
## If {}, select all PodMonitors ## If {}, select all PodMonitors
@@ -2328,9 +2985,13 @@ @@ -2328,9 +3003,13 @@
## Resource limits & requests ## Resource limits & requests
## ##
@ -969,7 +987,7 @@
## Prometheus StorageSpec for persistent data ## Prometheus StorageSpec for persistent data
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md
@@ -2353,7 +3014,13 @@ @@ -2353,7 +3032,13 @@
# medium: Memory # medium: Memory
# Additional volumes on the output StatefulSet definition. # Additional volumes on the output StatefulSet definition.
@ -984,7 +1002,7 @@
# Additional VolumeMounts on the output StatefulSet definition. # Additional VolumeMounts on the output StatefulSet definition.
volumeMounts: [] volumeMounts: []
@@ -2475,9 +3142,34 @@ @@ -2475,9 +3160,34 @@
# fileName: "objstore.yaml" # fileName: "objstore.yaml"
# objectStorageConfigFile: /var/secrets/object-store.yaml # objectStorageConfigFile: /var/secrets/object-store.yaml
@ -1020,7 +1038,7 @@
## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes ## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes
## (permissions, dir tree) on mounted volumes before starting prometheus ## (permissions, dir tree) on mounted volumes before starting prometheus
@@ -2485,7 +3177,7 @@ @@ -2485,7 +3195,7 @@
## PortName to use for Prometheus. ## PortName to use for Prometheus.
## ##

11
packages/rancher-monitoring/rancher-service-metrics/charts/Chart.yaml
View File

@ -1,11 +0,0 @@
annotations:
catalog.cattle.io/hidden: "true"
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: cattle-monitoring-system
catalog.rancher.io/release-name: rancher-service-metrics
apiVersion: v1
appVersion: 0.0.1
description: Scrapes service metrics for Rancher
name: rancher-service-metrics
type: application
version: 0.1.0

1
packages/rancher-monitoring/rancher-service-metrics/charts/values.yaml
View File

@ -1 +0,0 @@
chartLabel: ""

3
packages/rancher-monitoring/rancher-service-metrics/package.yaml
View File

@ -1,3 +0,0 @@
url: local
version: 100.0.0
doNotRelease: true