Replace chart with make remove && make charts

charts/rancher-monitoring-crd/100.2.0+up40.1.2/Chart.yaml

@@ -7,4 +7,4 @@ apiVersion: v1
 description: Installs the CRDs for rancher-monitoring.
 name: rancher-monitoring-crd
 type: application
-version: 100.2.0+up19.0.3
+version: 100.2.0+up40.1.2

charts/rancher-monitoring-crd/100.2.0+up40.1.2/templates/jobs.yaml

@@ -51,7 +51,7 @@ spec:
             echo "Applying CRDs...";
             mkdir -p /etc/crd;
             base64 -d /etc/config/crd-manifest.tgz.b64 | tar -xzv -C /etc/crd;
-            kubectl apply -Rf /etc/crd;
+            kubectl replace -Rf /etc/crd || kubectl create -Rf /etc/crd;
 
             echo "Waiting for CRDs to be recognized before finishing installation...";
 
@@ -132,7 +132,7 @@ spec:
             echo "Deleting CRDs...";
             mkdir -p /etc/crd;
             base64 -d /etc/config/crd-manifest.tgz.b64 | tar -xzv -C /etc/crd;
-            kubectl delete -Rf /etc/crd;
+            kubectl delete -Rf --ignore-not-found=true /etc/crd;
           volumeMounts:
             - name: crd-manifest
               readOnly: true

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmEtcd/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmEtcd/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmEtcd/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmEtcd/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmProxy/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmProxy/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmProxy/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmProxy/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmScheduler/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmScheduler/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmScheduler/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/kubeAdmScheduler/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2ControllerManager/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2ControllerManager/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2ControllerManager/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2ControllerManager/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Etcd/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Etcd/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Etcd/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Etcd/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2IngressNginx/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2IngressNginx/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2IngressNginx/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2IngressNginx/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Proxy/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Proxy/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Proxy/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Proxy/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Scheduler/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Scheduler/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Scheduler/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rke2Scheduler/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeControllerManager/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeControllerManager/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeControllerManager/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeControllerManager/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeEtcd/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeEtcd/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeEtcd/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeEtcd/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeIngressNginx/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeIngressNginx/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeIngressNginx/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeIngressNginx/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeProxy/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeProxy/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeProxy/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeProxy/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeScheduler/README.md

@@ -1,63 +0,0 @@
-# rancher-pushprox
-
-A Rancher chart based on Rancher [PushProx](https://github.com/rancher/PushProx) that sets up a Deployment of a PushProx proxy and a DaemonSet of PushProx clients on a Kubernetes cluster.
-
-Installs [rancher-pushprox](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-pushprox) to create PushProx clients that can access their host's network and register with a PushProx proxy. A [Prometheus Operator](https://github.com/coreos/prometheus-operator) ServiceMonitor CR is also included that is configured to scrape the metrics from each of the clients through the proxy.
-
-Using an instance of this chart is suitable for the following scenarios:
-- You need to scrape metrics from a port that should not be accessible outside of the host (e.g. scraping `etcd` metrics in a hardened cluster)
-- You need to scrape metrics on a host that are not exposed outside of 127.0.0.1 (e.g. scraping `kube-proxy` metrics)
-- You need to scrape metrics through HTTPS using certs hosted directly on `hostPath`
-- You need to scrape metrics from Kubernetes components that require authorization via a service account (e.g. permissions to make request to `/metrics`)
-- You need to scrape metrics without access to cacerts (i.e. enable `insecureSkipVerify`)
-
-The clients and proxy are created based on a Rancher fork of the [prometheus-community/PushProx](https://github.com/prometheus-community/PushProx) project.
-
-## Configuration
-
-The following tables list the configurable parameters of the rancher-pushprox chart and their default values.
-
-### General
-
-#### Required
-| Parameter | Description | Example |
-| ----- | ----------- | ------ |
-| `component` | The component that is being monitored | `kube-etcd`
-| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
-| `namespaceOverride` | The namespace to install the chart | `""`
-
-#### Optional
-| Parameter | Description | Default |
-| ----- | ----------- | ------ |
-| `serviceMonitor.enabled` | Deploys a [Prometheus Operator](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitor) ServiceMonitor CR that is configured to scrape metrics on the hosts that the clients are deployed on via the proxy. Also deploys a Service that points to all pods with the expected client name that exposes the `metricsPort` selected | `true` |
-| `serviceMonitor.endpoints` | A list of endpoints that will be added to the ServiceMonitor based on the [Endpoint spec](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint) | `[{port: metrics}]` |
-| `clients.enabled` | Deploys a DaemonSet of clients that are each capable of scraping endpoints on the hostNetwork it is deployed on | `true` |
-| `clients.port` |  The port where the client will publish PushProx client-specific metrics. If deploying multiple clients onto the same node, the clients should not have conflicting ports | `9369` |
-| `clients.proxyUrl` | Overrides the default proxyUrl setting of `http://pushprox-{{ .Values.component }}-proxy.{{ . Release.Namespace }}.svc.cluster.local:{{ .Values.proxy.port }}"` with the `proxyUrl` specified | `""` |
-| `clients.useLocalhost` | Sets a flag on each client deployment to redirect scrapes directed to `HOST_IP` to `127.0.0.1` | `false` |
-| `clients.https.enabled` | Enables scraping metrics via HTTPS using the provided TLS certs that exist on each host | `false` |
-| `clients.https.useServiceAccountCredentials` | If set to true, the client will create a service account with permissions to scrape `/metrics` endpoint of Kubernetes components. The client will use the service account token provided to make authorized scrape requests to the Kubernetes API | `false` |
-| `clients.https.insecureSkipVerify` | If set to true, the client will disable SSL security checks | `false` |
-| `clients.https.certDir` | A `hostPath` where TLS certs can be found. This path is mounted as a volume on an `initContainer` which copies only the necessary files over to an EmptyDir volume used by each client. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.certFile` | The path to the TLS cert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
-| `clients.https.seLinuxOptions` | seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host. Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided. | `""` |
-| `clients.metrics.enabled` | Whether the client should publish PushProx client-specific metrics. | `false` |
-| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
-| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
-| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
-| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
-| `clients.resources` | Set resource limits and requests for the client container | `{}` |
-| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
-| `clients.tolerations` | Specify tolerations for clients | `[]` |
-| `proxy.enabled` | Deploys the proxy that each client will register with | `true` |
-| `proxy.port` | The port exposed by the proxy that each client will register with to allow metrics to be scraped from the host | `8080` |
-| `proxy.resources` | Set resource limits and requests for the proxy container | `{}` |
-| `proxy.nodeSelector` | Select which nodes the proxy can be deployed on | `{}` |
-| `proxy.tolerations` | Specify tolerations (if necessary) to allow the proxy to be deployed on the selected node | `[]` |
-| `kubeVersionOverrides` | A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides. For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches any of the semver constraints provided as keys on the map. On seeing a match, the default value for each values.yaml field overridden will be updated with the new value. If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order. | `[]`
-
-*Tip: The filepaths set in `clients.https.<cert|key|caCert>File` can include wildcard characters*. 
-
-See [rancher-monitoring](https://github.com/rancher/charts/tree/gh-pages/packages/rancher-monitoring) for examples of how this chart can be used.

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeScheduler/templates/_helpers.tpl

@@ -1,113 +0,0 @@
-# Rancher
-
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- end -}}
-{{- end -}}
-
-# Windows Support
-
-{{/*
-Windows cluster will add default taint for linux nodes,
-add below linux tolerations to workloads could be scheduled to those linux nodes
-*/}}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-beta.kubernetes.io/os: linux
-{{- else -}}
-kubernetes.io/os: linux
-{{- end -}}
-{{- end -}}
-
-# General
-
-{{- define "applyKubeVersionOverrides" -}}
-{{- $overrides := dict -}}
-{{- range $override := .Values.kubeVersionOverrides -}}
-{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
-{{- $_ := mergeOverwrite $overrides $override.values -}}
-{{- end -}}
-{{- end -}}
-{{- $_ := mergeOverwrite .Values $overrides -}}
-{{- end -}}
-
-{{- define "pushprox.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "pushProxy.commonLabels" -}}
-release: {{ .Release.Name }}
-component: {{ .Values.component | quote }}
-provider: kubernetes
-{{- end -}}
-
-{{- define "pushProxy.proxyUrl" -}}
-{{- $_ := (required "Template requires either .Values.proxy.port or .Values.client.proxyUrl to set proxyUrl for client" (or .Values.clients.proxyUrl .Values.proxy.port)) -}}
-{{- if .Values.clients.proxyUrl -}}
-{{ printf "%s" .Values.clients.proxyUrl }}
-{{- else -}}
-{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
-{{- end -}}{{- end -}}
-
-# Client
-
-{{- define "pushProxy.client.name" -}}
-{{- printf "pushprox-%s-client" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.client.labels" -}}
-k8s-app: {{ template "pushProxy.client.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# Proxy
-
-{{- define "pushProxy.proxy.name" -}}
-{{- printf "pushprox-%s-proxy" (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.proxy.labels" -}}
-k8s-app: {{ template "pushProxy.proxy.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-# ServiceMonitor
-
-{{- define "pushprox.serviceMonitor.name" -}}
-{{- printf "%s-%s" .Release.Name (required ".Values.component is required" .Values.component) -}}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.labels" -}}
-app: {{ template "pushprox.serviceMonitor.name" . }}
-{{ template "pushProxy.commonLabels" . }}
-{{- end -}}
-
-{{- define "pushProxy.serviceMonitor.endpoints" -}}
-{{- $proxyURL := (include "pushProxy.proxyUrl" .) -}}
-{{- $useHTTPS := .Values.clients.https.enabled -}}
-{{- $endpoints := .Values.serviceMonitor.endpoints }}
-{{- range $endpoints }}
-{{- $_ := set . "proxyUrl" $proxyURL }}
-{{- if $useHTTPS -}}
-{{- if (hasKey . "params") }}
-{{- $_ := set (get . "params") "_scheme" (list "https") }}
-{{- else }}
-{{- $_ := set . "params" (dict "_scheme" (list "https")) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- toYaml $endpoints }}
-{{- end -}}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeScheduler/templates/pushprox-servicemonitor.yaml

@@ -1,34 +0,0 @@
-{{- template "applyKubeVersionOverrides" . -}}
-{{- if .Values.serviceMonitor }}{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "pushprox.serviceMonitor.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.serviceMonitor.labels" . | nindent 4 }}
-spec:
-  endpoints: {{include "pushProxy.serviceMonitor.endpoints" . | nindent 4 }}
-  jobLabel: component
-  podTargetLabels:
-  - component
-  - pushprox-exporter
-  namespaceSelector:
-    matchNames:
-    - {{ template "pushprox.namespace" . }}
-  selector:
-    matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "pushProxy.client.name" . }}
-  namespace: {{ template "pushprox.namespace" . }}
-  labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
-spec:
-  ports:
-  - name: metrics
-    port: {{ required "Need .Values.metricsPort to configure client to listen to metrics at port" .Values.metricsPort}}
-    protocol: TCP
-    targetPort: {{ .Values.metricsPort }}
-  selector: {{ include "pushProxy.client.labels" . | nindent 4 }}
-{{- end }}{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/charts/rkeScheduler/values.yaml

@@ -1,137 +0,0 @@
-# Default values for rancher-pushprox.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# Default image containing both the proxy and the client was generated from the following Dockerfile
-# https://github.com/prometheus-community/PushProx/blob/eeadbe766641699129920ccfaaaa30a85c67fe81/Dockerfile#L1-L15
-
-# Configuration
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  seLinux:
-    enabled: false
-
-# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
-#
-# For each key in kubeVersionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
-# any of the semver constraints provided as keys on the map.
-#
-# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
-#
-# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
-#
-# Notes:
-# - On running a helm template, Helm generally assumes the kubeVersion is v1.20.0
-# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
-kubeVersionOverrides: []
-# - constraint: "< 1.21"
-#   values:
-#     metricsPort: 10252
-#     clients:
-#       https:
-#         enabled: false
-#         insecureSkipVerify: false
-#         useServiceAccountCredentials: false
-
-namespaceOverride: ""
-
-# The component that is being monitored (i.e. etcd)
-component: "component"
-
-# The port containing the metrics that need to be scraped
-metricsPort: 2739
-
-# Configure ServiceMonitor that monitors metrics from the metricsPort endpoint
-serviceMonitor:
-  enabled: true
-  # A list of endpoints that will be added to the ServiceMonitor based on the Endpoint spec
-  # Source: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
-  # By default, proxyUrl and params._scheme will be overridden based on other values
-  endpoints:
-  - port: metrics
-
-clients:
-  enabled: true
-  # The port which the PushProx client will post PushProx metrics to
-  port: 9369
-  # If unset, this will default to the URL for the proxy service: http://pushprox-{{component}}-proxy.{{namepsace}}.svc.cluster.local:{{proxy.port}}
-  # Should be modified if the clients are being deployed outside the cluster where the proxy rests, otherwise leave it null
-  proxyUrl: ""
-  # If set to true, the client will forward any requests from the host IP to 127.0.0.1
-  # It will only allow proxy requests to the metricsPort specified
-  useLocalhost: false
-  # Configuration for accessing metrics via HTTPS
-  https:
-    # Does the client require https to access the metrics?
-    enabled: false
-    # If set to true, the client will create a service account with adequate permissions and set a flag
-    # on the client to use the service account token provided by it to make authorized scrape requests
-    useServiceAccountCredentials: false
-    # If set to true, the client will disable SSL security checks
-    insecureSkipVerify: false
-    # Directory on host where necessary TLS cert and key to scrape metrics can be found
-    certDir: ""
-    # Filenames for files located in .Values.clients.https.certDir that correspond to TLS settings
-    certFile: ""
-    keyFile: ""
-    caCertFile: ""
-    # seLinuxOptions to be passed into the container that copies certs. Should define a container with permissions to read the files in the certDir provided on the host.
-    # Required and only used if `clients.https.enabled` is set and `clients.https.certDir` is provided.
-    seLinuxOptions: {}
-
-  metrics:
-    # Whether the client should publish PushProx client-specific metrics to .Values.clients.port
-    enabled: false
-
-  rbac:
-    # Additional permissions to provide to the ServiceAccount bound to the client
-    # This can be used to provide additional permissions for the client to scrape metrics from the k8s API
-    # Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true
-    additionalRules: []
-
-  # Resource limits
-  resources: {}
-
-  # Options to select all nodes to deploy client DaemonSet on
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-  image:
-    repository: rancher/pushprox-client
-    tag: v0.1.0-rancher2-client
-  command: ["pushprox-client"]
-
-  copyCertsImage:
-    repository: rancher/mirrored-library-busybox
-    tag: 1.31.1
-
-  # The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
-  # This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
-  # situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
-  # However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
-  # this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
-  # If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
-  # be responsible for upgrading this chart accordingly to the right number of replicas.
-  deployment:
-    enabled: false
-    replicas: 0
-
-proxy:
-  enabled: true
-  # The port through which PushProx clients will communicate to the proxy
-  port: 8080
-  
-  # Resource limits
-  resources: {}
-  
-  # Options to select a node to run a single proxy deployment on
-  nodeSelector: {}
-  tolerations: []
-
-  image:
-    repository: rancher/pushprox-proxy
-    tag: v0.1.0-rancher2-proxy
-  command: ["pushprox-proxy"]

charts/rancher-monitoring/100.2.0+up19.0.3/templates/exporters/kube-state-metrics/serviceMonitor.yaml

@@ -1,64 +0,0 @@
-{{- if .Values.kubeStateMetrics.enabled }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.namespaceOverride }}
-{{- fail "kubeStateMetrics.serviceMonitor.namespaceOverride was removed. Please use kube-state-metrics.namespaceOverride instead." }}
-{{- end }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "kube-prometheus-stack.fullname" . }}-kube-state-metrics
-  namespace: {{ template "kube-prometheus-stack-kube-state-metrics.namespace" . }}
-  labels:
-    app: {{ template "kube-prometheus-stack.name" . }}-kube-state-metrics
-{{ include "kube-prometheus-stack.labels" . | indent 4 }}
-spec:
-  jobLabel: app.kubernetes.io/name
-  endpoints:
-  - port: http
-    {{- if .Values.kubeStateMetrics.serviceMonitor.interval }}
-    interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.kubeStateMetrics.serviceMonitor.scrapeTimeout }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.serviceMonitor.proxyUrl }}
-    proxyUrl: {{ .Values.kubeStateMetrics.serviceMonitor.proxyUrl}}
-    {{- end }}
-    honorLabels: {{ .Values.kubeStateMetrics.serviceMonitor.honorLabels }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }}
-    metricRelabelings:
-{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4) . }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.relabelings }}
-    relabelings:
-{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4) . }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.selfMonitor.enabled }}
-  - port: metrics
-    {{- if .Values.kubeStateMetrics.serviceMonitor.interval }}
-    interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.kubeStateMetrics.serviceMonitor.proxyUrl }}
-    proxyUrl: {{ .Values.kubeStateMetrics.serviceMonitor.proxyUrl}}
-    {{- end }}
-    honorLabels: {{ .Values.kubeStateMetrics.serviceMonitor.honorLabels }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }}
-    metricRelabelings:
-{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4) . }}
-{{- end }}
-{{- if .Values.kubeStateMetrics.serviceMonitor.relabelings }}
-    relabelings:
-{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4) . }}
-{{- end }}
-{{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ printf "%s" (include "kube-prometheus-stack-kube-state-metrics.namespace" .) | quote }}
-  selector:
-    matchLabels:
-{{- if .Values.kubeStateMetrics.serviceMonitor.selectorOverride }}
-{{ toYaml .Values.kubeStateMetrics.serviceMonitor.selectorOverride | indent 6 }}
-{{ else }}
-      app.kubernetes.io/name: kube-state-metrics
-      app.kubernetes.io/instance: "{{ $.Release.Name }}"
-{{- end }}
-{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/templates/exporters/node-exporter/servicemonitor.yaml

@@ -1,41 +0,0 @@
-{{- if (and (not .Values.nodeExporter.enabled) .Values.hardenedNodeExporter.enabled) }}
-{{ required "Cannot set .Values.hardenedNodeExporter.enabled=true when .Values.nodeExporter.enabled=false" "" }}
-{{- end }}
-{{- if (and .Values.nodeExporter.enabled (not .Values.hardenedNodeExporter.enabled)) }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "kube-prometheus-stack.fullname" . }}-node-exporter
-  namespace: {{ template "kube-prometheus-stack-prometheus-node-exporter.namespace" . }}
-  labels:
-    app: {{ template "kube-prometheus-stack.name" . }}-node-exporter
-{{ include "kube-prometheus-stack.labels" . | indent 4 }}
-spec:
-  jobLabel: {{ .Values.nodeExporter.jobLabel }}
-  selector:
-    matchLabels:
-      app: prometheus-node-exporter
-      release: {{ $.Release.Name }}
-  namespaceSelector:
-    matchNames:
-      - {{ printf "%s" (include "kube-prometheus-stack-prometheus-node-exporter.namespace" .) | quote }}
-  endpoints:
-  - port: metrics
-    {{- if .Values.nodeExporter.serviceMonitor.interval }}
-    interval: {{ .Values.nodeExporter.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.nodeExporter.serviceMonitor.proxyUrl }}
-    proxyUrl: {{ .Values.nodeExporter.serviceMonitor.proxyUrl}}
-    {{- end }}
-    {{- if .Values.nodeExporter.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.nodeExporter.serviceMonitor.scrapeTimeout }}
-    {{- end }}
-{{- if .Values.nodeExporter.serviceMonitor.metricRelabelings }}
-    metricRelabelings:
-{{ tpl (toYaml .Values.nodeExporter.serviceMonitor.metricRelabelings | indent 4) . }}
-{{- end }}
-{{- if .Values.nodeExporter.serviceMonitor.relabelings }}
-    relabelings:
-{{ tpl (toYaml .Values.nodeExporter.serviceMonitor.relabelings | indent 4) . }}
-{{- end }}
-{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/templates/grafana/dashboards-1.14/statefulset.yaml

@@ -1,928 +0,0 @@
-{{- /*
-Generated from 'statefulset' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml
-Do not change in-place! In order to change this file first read following link:
-https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
-*/ -}}
-{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
-{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards) (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: {{ .Values.grafana.defaultDashboards.namespace }}
-  name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }}
-  annotations:
-{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
-  labels:
-    {{- if $.Values.grafana.sidecar.dashboards.label }}
-    {{ $.Values.grafana.sidecar.dashboards.label }}: "1"
-    {{- end }}
-    app: {{ template "kube-prometheus-stack.name" $ }}-grafana
-{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
-data:
-  statefulset.json: |-
-    {
-        "__inputs": [
-
-        ],
-        "__requires": [
-
-        ],
-        "annotations": {
-            "list": [
-
-            ]
-        },
-        "editable": false,
-        "gnetId": null,
-        "graphTooltip": 0,
-        "hideControls": false,
-        "id": null,
-        "links": [
-
-        ],
-        "refresh": "",
-        "rows": [
-            {
-                "collapse": false,
-                "collapsed": false,
-                "panels": [
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 2,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "cores",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 4,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": true
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "sum(rate(container_cpu_usage_seconds_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m]))",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "CPU",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    },
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 3,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "GB",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 4,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": true
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "sum(container_memory_usage_bytes{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}) / 1024^3",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Memory",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    },
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 4,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "Bps",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 4,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": true
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "sum(rate(container_network_transmit_bytes_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m])) + sum(rate(container_network_receive_bytes_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"$statefulset.*\"}[3m]))",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Network",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    }
-                ],
-                "repeat": null,
-                "repeatIteration": null,
-                "repeatRowId": null,
-                "showTitle": false,
-                "title": "Dashboard Row",
-                "titleSize": "h6",
-                "type": "row"
-            },
-            {
-                "collapse": false,
-                "collapsed": false,
-                "height": "100px",
-                "panels": [
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 5,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 3,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "full": false,
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": false
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "max(kube_statefulset_replicas{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", statefulset=\"$statefulset\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Desired Replicas",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    },
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 6,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 3,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "full": false,
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": false
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "min(kube_statefulset_status_replicas_current{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", statefulset=\"$statefulset\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Replicas of current version",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    },
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 7,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 3,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "full": false,
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": false
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "max(kube_statefulset_status_observed_generation{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", statefulset=\"$statefulset\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Observed Generation",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    },
-                    {
-                        "cacheTimeout": null,
-                        "colorBackground": false,
-                        "colorValue": false,
-                        "colors": [
-                            "#299c46",
-                            "rgba(237, 129, 40, 0.89)",
-                            "#d44a3a"
-                        ],
-                        "datasource": "$datasource",
-                        "format": "none",
-                        "gauge": {
-                            "maxValue": 100,
-                            "minValue": 0,
-                            "show": false,
-                            "thresholdLabels": false,
-                            "thresholdMarkers": true
-                        },
-                        "gridPos": {
-
-                        },
-                        "id": 8,
-                        "interval": null,
-                        "links": [
-
-                        ],
-                        "mappingType": 1,
-                        "mappingTypes": [
-                            {
-                                "name": "value to text",
-                                "value": 1
-                            },
-                            {
-                                "name": "range to text",
-                                "value": 2
-                            }
-                        ],
-                        "maxDataPoints": 100,
-                        "nullPointMode": "connected",
-                        "nullText": null,
-                        "postfix": "",
-                        "postfixFontSize": "50%",
-                        "prefix": "",
-                        "prefixFontSize": "50%",
-                        "rangeMaps": [
-                            {
-                                "from": "null",
-                                "text": "N/A",
-                                "to": "null"
-                            }
-                        ],
-                        "span": 3,
-                        "sparkline": {
-                            "fillColor": "rgba(31, 118, 189, 0.18)",
-                            "full": false,
-                            "lineColor": "rgb(31, 120, 193)",
-                            "show": false
-                        },
-                        "tableColumn": "",
-                        "targets": [
-                            {
-                                "expr": "max(kube_statefulset_metadata_generation{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "",
-                                "refId": "A"
-                            }
-                        ],
-                        "thresholds": "",
-                        "title": "Metadata Generation",
-                        "tooltip": {
-                            "shared": false
-                        },
-                        "type": "singlestat",
-                        "valueFontSize": "80%",
-                        "valueMaps": [
-                            {
-                                "op": "=",
-                                "text": "0",
-                                "value": "null"
-                            }
-                        ],
-                        "valueName": "current"
-                    }
-                ],
-                "repeat": null,
-                "repeatIteration": null,
-                "repeatRowId": null,
-                "showTitle": false,
-                "title": "Dashboard Row",
-                "titleSize": "h6",
-                "type": "row"
-            },
-            {
-                "collapse": false,
-                "collapsed": false,
-                "panels": [
-                    {
-                        "aliasColors": {
-
-                        },
-                        "bars": false,
-                        "dashLength": 10,
-                        "dashes": false,
-                        "datasource": "$datasource",
-                        "fill": 1,
-                        "fillGradient": 0,
-                        "gridPos": {
-
-                        },
-                        "id": 9,
-                        "legend": {
-                            "alignAsTable": false,
-                            "avg": false,
-                            "current": false,
-                            "max": false,
-                            "min": false,
-                            "rightSide": false,
-                            "show": true,
-                            "sideWidth": null,
-                            "total": false,
-                            "values": false
-                        },
-                        "lines": true,
-                        "linewidth": 1,
-                        "links": [
-
-                        ],
-                        "nullPointMode": "null",
-                        "percentage": false,
-                        "pointradius": 5,
-                        "points": false,
-                        "renderer": "flot",
-                        "repeat": null,
-                        "seriesOverrides": [
-
-                        ],
-                        "spaceLength": 10,
-                        "stack": false,
-                        "steppedLine": false,
-                        "targets": [
-                            {
-                                "expr": "max(kube_statefulset_replicas{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "replicas specified",
-                                "refId": "A"
-                            },
-                            {
-                                "expr": "max(kube_statefulset_status_replicas{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "replicas created",
-                                "refId": "B"
-                            },
-                            {
-                                "expr": "min(kube_statefulset_status_replicas_ready{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "ready",
-                                "refId": "C"
-                            },
-                            {
-                                "expr": "min(kube_statefulset_status_replicas_current{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "replicas of current version",
-                                "refId": "D"
-                            },
-                            {
-                                "expr": "min(kube_statefulset_status_replicas_updated{job=\"kube-state-metrics\", statefulset=\"$statefulset\", cluster=\"$cluster\", namespace=\"$namespace\"}) without (instance, pod)",
-                                "format": "time_series",
-                                "intervalFactor": 2,
-                                "legendFormat": "updated",
-                                "refId": "E"
-                            }
-                        ],
-                        "thresholds": [
-
-                        ],
-                        "timeFrom": null,
-                        "timeShift": null,
-                        "title": "Replicas",
-                        "tooltip": {
-                            "shared": false,
-                            "sort": 0,
-                            "value_type": "individual"
-                        },
-                        "type": "graph",
-                        "xaxis": {
-                            "buckets": null,
-                            "mode": "time",
-                            "name": null,
-                            "show": true,
-                            "values": [
-
-                            ]
-                        },
-                        "yaxes": [
-                            {
-                                "format": "short",
-                                "label": null,
-                                "logBase": 1,
-                                "max": null,
-                                "min": null,
-                                "show": true
-                            },
-                            {
-                                "format": "short",
-                                "label": null,
-                                "logBase": 1,
-                                "max": null,
-                                "min": null,
-                                "show": true
-                            }
-                        ]
-                    }
-                ],
-                "repeat": null,
-                "repeatIteration": null,
-                "repeatRowId": null,
-                "showTitle": false,
-                "title": "Dashboard Row",
-                "titleSize": "h6",
-                "type": "row"
-            }
-        ],
-        "schemaVersion": 14,
-        "style": "dark",
-        "tags": [
-            "kubernetes-mixin"
-        ],
-        "templating": {
-            "list": [
-                {
-                    "current": {
-                        "text": "default",
-                        "value": "default"
-                    },
-                    "hide": 0,
-                    "label": null,
-                    "name": "datasource",
-                    "options": [
-
-                    ],
-                    "query": "prometheus",
-                    "refresh": 1,
-                    "regex": "",
-                    "type": "datasource"
-                },
-                {
-                    "allValue": null,
-                    "current": {
-
-                    },
-                    "datasource": "$datasource",
-                    "hide": {{ if .Values.grafana.sidecar.dashboards.multicluster }}0{{ else }}2{{ end }},
-                    "includeAll": false,
-                    "label": "cluster",
-                    "multi": false,
-                    "name": "cluster",
-                    "options": [
-
-                    ],
-                    "query": "label_values(kube_statefulset_metadata_generation, cluster)",
-                    "refresh": 2,
-                    "regex": "",
-                    "sort": 1,
-                    "tagValuesQuery": "",
-                    "tags": [
-
-                    ],
-                    "tagsQuery": "",
-                    "type": "query",
-                    "useTags": false
-                },
-                {
-                    "allValue": null,
-                    "current": {
-
-                    },
-                    "datasource": "$datasource",
-                    "hide": 0,
-                    "includeAll": false,
-                    "label": "Namespace",
-                    "multi": false,
-                    "name": "namespace",
-                    "options": [
-
-                    ],
-                    "query": "label_values(kube_statefulset_metadata_generation{job=\"kube-state-metrics\", cluster=\"$cluster\"}, namespace)",
-                    "refresh": 2,
-                    "regex": "",
-                    "sort": 1,
-                    "tagValuesQuery": "",
-                    "tags": [
-
-                    ],
-                    "tagsQuery": "",
-                    "type": "query",
-                    "useTags": false
-                },
-                {
-                    "allValue": null,
-                    "current": {
-
-                    },
-                    "datasource": "$datasource",
-                    "hide": 0,
-                    "includeAll": false,
-                    "label": "Name",
-                    "multi": false,
-                    "name": "statefulset",
-                    "options": [
-
-                    ],
-                    "query": "label_values(kube_statefulset_metadata_generation{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\"}, statefulset)",
-                    "refresh": 2,
-                    "regex": "",
-                    "sort": 1,
-                    "tagValuesQuery": "",
-                    "tags": [
-
-                    ],
-                    "tagsQuery": "",
-                    "type": "query",
-                    "useTags": false
-                }
-            ]
-        },
-        "time": {
-            "from": "now-1h",
-            "to": "now"
-        },
-        "timepicker": {
-            "refresh_intervals": [
-                "5s",
-                "10s",
-                "30s",
-                "1m",
-                "5m",
-                "15m",
-                "30m",
-                "1h",
-                "2h",
-                "1d"
-            ],
-            "time_options": [
-                "5m",
-                "15m",
-                "1h",
-                "6h",
-                "12h",
-                "24h",
-                "2d",
-                "7d",
-                "30d"
-            ]
-        },
-        "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}",
-        "title": "Kubernetes / StatefulSets",
-        "uid": "a31c1f46e6f727cb37c0d731a7245005",
-        "version": 0
-    }
-{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/templates/prometheus-operator/aggregate-clusterroles.yaml

@@ -1,31 +0,0 @@
-{{/* This file is based on https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/rbac-crd.md */}}
-{{- if and .Values.global.rbac.create .Values.global.rbac.createAggregateClusterRoles }}
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-crd-view
-  labels:
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-    app: {{ template "kube-prometheus-stack.name" . }}-operator
-    {{- include "kube-prometheus-stack.labels" . | nindent 4 }}
-rules:
-- apiGroups: ["monitoring.coreos.com"]
-  resources: ["alertmanagers", "alertmanagerconfigs", "prometheuses", "prometheusrules", "servicemonitors", "podmonitors", "probes"]
-  verbs: ["get", "list", "watch"]
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-crd-edit
-  labels:
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app: {{ template "kube-prometheus-stack.name" . }}-operator
-    {{- include "kube-prometheus-stack.labels" . | nindent 4 }}
-rules:
-- apiGroups: ["monitoring.coreos.com"]
-  resources: ["alertmanagers", "alertmanagerconfigs", "prometheuses", "prometheusrules", "servicemonitors", "podmonitors", "probes"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/templates/prometheus/rules-1.14/kube-apiserver-burnrate.rules.yaml

@@ -1,328 +0,0 @@
-{{- /*
-Generated from 'kube-apiserver-burnrate.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetesControlPlane-prometheusRule.yaml
-Do not change in-place! In order to change this file first read following link:
-https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
-*/ -}}
-{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
-{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverBurnrate }}
-apiVersion: monitoring.coreos.com/v1
-kind: PrometheusRule
-metadata:
-  name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver-burnrate.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
-  labels:
-    app: {{ template "kube-prometheus-stack.name" . }}
-{{ include "kube-prometheus-stack.labels" . | indent 4 }}
-{{- if .Values.defaultRules.labels }}
-{{ toYaml .Values.defaultRules.labels | indent 4 }}
-{{- end }}
-{{- if .Values.defaultRules.annotations }}
-  annotations:
-{{ toYaml .Values.defaultRules.annotations | indent 4 }}
-{{- end }}
-spec:
-  groups:
-  - name: kube-apiserver-burnrate.rules
-    rules:
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[1d]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[1d]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[1d]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[1d]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1d]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1d]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate1d
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[1h]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[1h]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[1h]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[1h]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1h]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate1h
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[2h]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[2h]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[2h]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[2h]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[2h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[2h]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate2h
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[30m]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[30m]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[30m]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[30m]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[30m]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[30m]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate30m
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[3d]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[3d]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[3d]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[3d]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[3d]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[3d]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate3d
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[5m]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[5m]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[5m]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[5m]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[5m]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate5m
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward"}[6h]))
-            -
-            (
-              (
-                sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope=~"resource|",le="1"}[6h]))
-                or
-                vector(0)
-              )
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="namespace",le="5"}[6h]))
-              +
-              sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",subresource!~"proxy|attach|log|exec|portforward",scope="cluster",le="30"}[6h]))
-            )
-          )
-          +
-          # errors
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[6h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[6h]))
-      labels:
-        verb: read
-      record: apiserver_request:burnrate6h
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[1d]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[1d]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1d]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate1d
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[1h]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[1h]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate1h
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[2h]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[2h]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[2h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate2h
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[30m]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[30m]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[30m]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate30m
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[3d]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[3d]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[3d]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate3d
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[5m]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[5m]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[5m]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate5m
-    - expr: |-
-        (
-          (
-            # too slow
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward"}[6h]))
-            -
-            sum by (cluster) (rate(apiserver_request_slo_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",subresource!~"proxy|attach|log|exec|portforward",le="1"}[6h]))
-          )
-          +
-          sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[6h]))
-        )
-        /
-        sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h]))
-      labels:
-        verb: write
-      record: apiserver_request:burnrate6h
-{{- end }}

charts/rancher-monitoring/100.2.0+up19.0.3/templates/rancher-monitoring/dashboards/rancher/k8s-dashboards.yaml

@@ -1,17 +0,0 @@
-{{- if and .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: {{ .Values.grafana.defaultDashboards.namespace }}
-  name: rancher-default-dashboards-k8s
-  annotations:
-{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
-  labels:
-    {{- if $.Values.grafana.sidecar.dashboards.label }}
-    {{ $.Values.grafana.sidecar.dashboards.label }}: "1"
-    {{- end }}
-    app: {{ template "kube-prometheus-stack.name" $ }}-grafana
-{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
-data:
-{{ (.Files.Glob "files/rancher/k8s/*").AsConfig | indent 2 }}
-{{- end }}

charts/rancher-monitoring/100.2.0+up40.1.2/Chart.yaml

@@ -101,24 +101,28 @@ keywords:
 - monitoring
 kubeVersion: '>=1.16.0-0'
 maintainers:
-- name: vsliouniaev
-- name: bismarck
+- email: andrew@quadcorps.co.uk
+  name: andrewgkew
+- email: cedric@desaintmartin.fr
+  name: desaintmartin
 - email: gianrubio@gmail.com
   name: gianrubio
 - email: github.gkarthiks@gmail.com
   name: gkarthiks
+- email: kube-prometheus-stack@sisti.pt
+  name: GMartinez-Sisti
 - email: scott@r6by.com
   name: scottrigby
 - email: miroslav.hadzhiev@gmail.com
   name: Xtigyro
 - email: arvind.iyengar@suse.com
   name: Arvind
-- email: jiaqi.luo@suse.com
-  name: Jack
-  url: https://github.com/jiaqiluo
+- email: amangeet.samra@suse.com
+  name: Geet
+  url: https://github.com/geethub97
 name: rancher-monitoring
 sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 100.2.0+up19.0.3
+version: 100.2.0+up40.1.2

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/Chart.yaml

@@ -1,11 +1,12 @@
 annotations:
   catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
   catalog.cattle.io/os: linux
   catalog.rancher.io/certified: rancher
   catalog.rancher.io/namespace: cattle-monitoring-system
   catalog.rancher.io/release-name: rancher-grafana
 apiVersion: v2
-appVersion: 8.5.3
+appVersion: 9.1.5
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
 icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
@@ -25,4 +26,4 @@ name: grafana
 sources:
 - https://github.com/grafana/grafana
 type: application
-version: 6.29.12
+version: 6.38.6

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/README.md

@@ -67,6 +67,7 @@ This version requires Helm >= 3.1.0.
 | `service.type`                            | Kubernetes service type                       | `ClusterIP`                                             |
 | `service.port`                            | Kubernetes port where service is exposed      | `80`                                                    |
 | `service.portName`                        | Name of the port on the service               | `service`                                               |
+| `service.appProtocol`                     | Adds the appProtocol field to the service     | ``                                                      |
 | `service.targetPort`                      | Internal service is port                      | `3000`                                                  |
 | `service.nodePort`                        | Kubernetes service nodePort                   | `nil`                                                   |
 | `service.annotations`                     | Service annotations (can be templated)        | `{}`                                                    |
@@ -122,10 +123,12 @@ This version requires Helm >= 3.1.0.
 | `enableServiceLinks`                      | Inject Kubernetes services as environment variables. | `true`                                           |
 | `extraSecretMounts`                       | Additional grafana server secret mounts       | `[]`                                                    |
 | `extraVolumeMounts`                       | Additional grafana server volume mounts       | `[]`                                                    |
+| `createConfigmap`                         | Enable creating the grafana configmap         | `true`                                                  |
 | `extraConfigmapMounts`                    | Additional grafana server configMap volume mounts (values are templated) | `[]`                         |
 | `extraEmptyDirMounts`                     | Additional grafana server emptyDir volume mounts | `[]`                                                 |
 | `plugins`                                 | Plugins to be loaded along with Grafana       | `[]`                                                    |
 | `datasources`                             | Configure grafana datasources (passed through tpl) | `{}`                                               |
+| `alerting`                                | Configure grafana alerting (passed through tpl) | `{}`                                                  |
 | `notifiers`                               | Configure grafana notifiers                   | `{}`                                                    |
 | `dashboardProviders`                      | Configure grafana dashboard providers         | `{}`                                                    |
 | `dashboards`                              | Dashboards to import                          | `{}`                                                    |
@@ -141,7 +144,7 @@ This version requires Helm >= 3.1.0.
 | `podPortName`                             | Name of the grafana port on the pod           | `grafana`                                               |
 | `lifecycleHooks`                          | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers)     | `{}`                                                    |
 | `sidecar.image.repository`                | Sidecar image repository                      | `quay.io/kiwigrid/k8s-sidecar`                          |
-| `sidecar.image.tag`                       | Sidecar image tag                             | `1.15.6`                                                |
+| `sidecar.image.tag`                       | Sidecar image tag                             | `1.19.2`                                                |
 | `sidecar.image.sha`                       | Sidecar image sha (optional)                  | `""`                                                    |
 | `sidecar.imagePullPolicy`                 | Sidecar image pull policy                     | `IfNotPresent`                                          |
 | `sidecar.resources`                       | Sidecar resources                             | `{}`                                                    |
@@ -159,7 +162,7 @@ This version requires Helm >= 3.1.0.
 | `sidecar.dashboards.watchMethod`          | Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. | `WATCH` |
 | `sidecar.skipTlsVerify`                   | Set to true to skip tls verification for kube api calls | `nil`                                         |
 | `sidecar.dashboards.label`                | Label that config maps with dashboards should have to be added | `grafana_dashboard`                                |
-| `sidecar.dashboards.labelValue`                | Label value that config maps with dashboards should have to be added | `nil`                                |
+| `sidecar.dashboards.labelValue`                | Label value that config maps with dashboards should have to be added | `""`                                |
 | `sidecar.dashboards.folder`               | Folder in the pod that should hold the collected dashboards (unless `sidecar.dashboards.defaultFolderName` is set). This path will be mounted. | `/tmp/dashboards`    |
 | `sidecar.dashboards.folderAnnotation`     | The annotation the sidecar will look for in configmaps to override the destination folder for files | `nil`                                                  |
 | `sidecar.dashboards.defaultFolderName`    | The default folder name, it will create a subfolder under the `sidecar.dashboards.folder` and put dashboards in there instead | `nil`                                |
@@ -169,7 +172,7 @@ This version requires Helm >= 3.1.0.
 | `sidecar.dashboards.extraMounts`          | Additional dashboard sidecar volume mounts. | `[]`                               |
 | `sidecar.datasources.enabled`             | Enables the cluster wide search for datasources and adds/updates/deletes them in grafana |`false`       |
 | `sidecar.datasources.label`               | Label that config maps with datasources should have to be added | `grafana_datasource`                               |
-| `sidecar.datasources.labelValue`          | Label value that config maps with datasources should have to be added | `nil`                                |
+| `sidecar.datasources.labelValue`          | Label value that config maps with datasources should have to be added | `""`                                |
 | `sidecar.datasources.searchNamespace`     | Namespaces list. If specified, the sidecar will search for datasources config-maps  inside these namespaces.Otherwise the namespace in which the sidecar is running will be used.It's also possible to specify ALL to search in all namespaces. | `nil`                               |
 | `sidecar.datasources.resource`            | Should the sidecar looks into secrets, configmaps or both. | `both`                               |
 | `sidecar.datasources.reloadURL`           | Full url of datasource configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/datasources/reload"` |
@@ -232,13 +235,14 @@ This version requires Helm >= 3.1.0.
 | `imageRenderer.priorityClassName`          | image-renderer deployment priority class                                           | `''`                             |
 | `imageRenderer.service.enabled`            | Enable the image-renderer service                                                  | `true`                           |
 | `imageRenderer.service.portName`           | image-renderer service port name                                                   | `http`                           |
-| `imageRenderer.service.port`               | image-renderer service port used by both service and deployment                    | `8081`                           |
-| `imageRenderer.grafanaProtocol`            | Protocol to use for image renderer callback url                                    | `http`                         |
+| `imageRenderer.service.port`               | image-renderer port used by deployment                                             | `8081`                           |
+| `imageRenderer.service.targetPort`         | image-renderer service port used by service                                        | `8081`                           |
+| `imageRenderer.appProtocol`                | Adds the appProtocol field to the service                                          | ``                               |
 | `imageRenderer.grafanaSubPath`             | Grafana sub path to use for image renderer callback url                            | `''`                             |
 | `imageRenderer.podPortName`                | name of the image-renderer port on the pod                                         | `http`                           |
 | `imageRenderer.revisionHistoryLimit`       | number of image-renderer replica sets to keep                                      | `10`                             |
-| `imageRenderer.networkPolicy.limitIngress` | Enable a NetworkPolicy to limit inbound traffic from only the created grafana pods  | `true`                           |
-| `imageRenderer.networkPolicy.limitEgress`  | Enable a NetworkPolicy to limit outbound traffic to only the created grafana pods   | `false`                          |
+| `imageRenderer.networkPolicy.limitIngress` | Enable a NetworkPolicy to limit inbound traffic from only the created grafana pods | `true`                           |
+| `imageRenderer.networkPolicy.limitEgress`  | Enable a NetworkPolicy to limit outbound traffic to only the created grafana pods  | `false`                          |
 | `imageRenderer.resources`                  | Set resource limits for image-renderer pdos                                        | `{}`                             |
 | `imageRenderer.nodeSelector`               | Node labels for pod assignment                | `{}`                                                    |
 | `imageRenderer.tolerations`                | Toleration labels for pod assignment          | `[]`                                                    |
@@ -246,6 +250,9 @@ This version requires Helm >= 3.1.0.
 | `networkPolicy.enabled`                    | Enable creation of NetworkPolicy resources.                                                                              | `false`             |
 | `networkPolicy.allowExternal`              | Don't require client label for connections                                                                               | `true`              |
 | `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed                           | `{}`                |
+| `networkPolicy.ingress`                    | Enable the creation of an ingress network policy             | `true`    |
+| `networkPolicy.egress.enabled`             | Enable the creation of an egress network policy              | `false`   |
+| `networkPolicy.egress.ports`               | An array of ports to allow for the egress                    | `[]`    |
 | `enableKubeBackwardCompatibility`          | Enable backward compatibility of kubernetes where pod's defintion version below 1.13 doesn't have the enableServiceLinks option  | `false`     |
 
 
@@ -269,7 +276,7 @@ ingress:
 ### Example of extraVolumeMounts
 
 Volume can be type persistentVolumeClaim or hostPath but not both at same time.
-If none existingClaim or hostPath argument is givent then type is emptyDir.
+If neither existingClaim or hostPath argument is given then type is emptyDir.
 
 ```yaml
 - extraVolumeMounts:
@@ -478,7 +485,7 @@ grafana.ini:
 
 ## How to securely reference secrets in grafana.ini
 
-This example uses Grafana uses [file providers](https://grafana.com/docs/grafana/latest/administration/configuration/#file-provider) for secret values and the `extraSecretMounts` configuration flag (Additional grafana server secret mounts) to mount the secrets.
+This example uses Grafana [file providers](https://grafana.com/docs/grafana/latest/administration/configuration/#file-provider) for secret values and the `extraSecretMounts` configuration flag (Additional grafana server secret mounts) to mount the secrets.
 
 In grafana.ini:
 

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/templates/_helpers.tpl

@@ -171,10 +171,10 @@ Return the appropriate apiVersion for ingress.
 {{- end -}}
 
 {{/*
-Return the appropriate apiVersion for podsecuritypolicy and PodDisruptionBudget.
+Return the appropriate apiVersion for podDisruptionBudget.
 */}}
-{{- define "grafana.policy.apiVersion" -}}
-  {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-1" .Capabilities.KubeVersion.Version) -}}
+{{- define "grafana.podDisruptionBudget.apiVersion" -}}
+  {{- if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
     {{- print "policy/v1" -}}
   {{- else -}}
     {{- print "policy/v1beta1" -}}

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/templates/_pod.tpl

@@ -4,13 +4,13 @@ schedulerName: "{{ .Values.schedulerName }}"
 {{- end }}
 serviceAccountName: {{ template "grafana.serviceAccountName" . }}
 automountServiceAccountToken: {{ .Values.serviceAccount.autoMount }}
-{{- if .Values.securityContext }}
+{{- with .Values.securityContext }}
 securityContext:
-{{ toYaml .Values.securityContext | indent 2 }}
+  {{- toYaml . | nindent 2 }}
 {{- end }}
-{{- if .Values.hostAliases }}
+{{- with .Values.hostAliases }}
 hostAliases:
-{{ toYaml .Values.hostAliases | indent 2 }}
+  {{- toYaml . | nindent 2 }}
 {{- end }}
 {{- if .Values.priorityClassName }}
 priorityClassName: {{ .Values.priorityClassName }}
@@ -30,8 +30,10 @@ initContainers:
       runAsNonRoot: false
       runAsUser: 0
     command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.runAsGroup }}", "/var/lib/grafana"]
+    {{- with .Values.initChownData.resources }}
     resources:
-{{ toYaml .Values.initChownData.resources | indent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: storage
         mountPath: "/var/lib/grafana"
@@ -49,13 +51,19 @@ initContainers:
     imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }}
     command: ["/bin/sh"]
     args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh -x /etc/grafana/download_dashboards.sh" ]
+    {{- with .Values.downloadDashboards.resources }}
     resources:
-{{ toYaml .Values.downloadDashboards.resources | indent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     env:
 {{- range $key, $value := .Values.downloadDashboards.env }}
       - name: "{{ $key }}"
         value: "{{ $value }}"
 {{- end }}
+    {{- with .Values.downloadDashboards.securityContext }}
+    securityContext:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 {{- if .Values.downloadDashboards.envFromSecret }}
     envFrom:
       - secretRef:
@@ -84,12 +92,15 @@ initContainers:
     image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
     {{- end }}
     imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
-    {{- if .Values.sidecar.datasources.envFromSecret }}
-    envFrom:
-      - secretRef:
-          name: {{ tpl .Values.sidecar.datasources.envFromSecret . }}
-    {{- end }}
     env:
+      {{- range $key, $value := .Values.sidecar.datasources.env }}
+      - name: "{{ $key }}"
+        value: "{{ $value }}"
+      {{- end }}
+      {{- if .Values.sidecar.datasources.ignoreAlreadyProcessed }}
+      - name: IGNORE_ALREADY_PROCESSED
+        value: "true"
+      {{- end }}
       - name: METHOD
         value: "LIST"
       - name: LABEL
@@ -98,6 +109,10 @@ initContainers:
       - name: LABEL_VALUE
         value: {{ quote .Values.sidecar.datasources.labelValue }}
       {{- end }}
+      {{- if or .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }}
+      - name: LOG_LEVEL
+        value: {{ default .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }}
+      {{- end }}
       - name: FOLDER
         value: "/etc/grafana/provisioning/datasources"
       - name: RESOURCE
@@ -108,18 +123,20 @@ initContainers:
       {{- end }}
       {{- if .Values.sidecar.datasources.searchNamespace }}
       - name: NAMESPACE
-        value: "{{ .Values.sidecar.datasources.searchNamespace | join "," }}"
+        value: "{{ tpl (.Values.sidecar.datasources.searchNamespace | join ",") . }}"
       {{- end }}
       {{- if .Values.sidecar.skipTlsVerify }}
       - name: SKIP_TLS_VERIFY
         value: "{{ .Values.sidecar.skipTlsVerify }}"
       {{- end }}
+    {{- with .Values.sidecar.resources }}
     resources:
-{{ toYaml .Values.sidecar.resources | indent 6 }}
-{{- if .Values.sidecar.securityContext }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.securityContext }}
     securityContext:
-{{- toYaml .Values.sidecar.securityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: sc-datasources-volume
         mountPath: "/etc/grafana/provisioning/datasources"
@@ -133,10 +150,26 @@ initContainers:
     {{- end }}
     imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
     env:
+      {{- range $key, $value := .Values.sidecar.notifiers.env }}
+      - name: "{{ $key }}"
+        value: "{{ $value }}"
+      {{- end }}
+      {{- if .Values.sidecar.notifiers.ignoreAlreadyProcessed }}
+      - name: IGNORE_ALREADY_PROCESSED
+        value: "true"
+      {{- end }}
       - name: METHOD
         value: LIST
       - name: LABEL
         value: "{{ .Values.sidecar.notifiers.label }}"
+      {{- if .Values.sidecar.notifiers.labelValue }}
+      - name: LABEL_VALUE
+        value: {{ quote .Values.sidecar.notifiers.labelValue }}
+      {{- end }}
+      {{- if or .Values.sidecar.logLevel .Values.sidecar.notifiers.logLevel }}
+      - name: LOG_LEVEL
+        value: {{ default .Values.sidecar.logLevel .Values.sidecar.notifiers.logLevel }}
+      {{- end }}
       - name: FOLDER
         value: "/etc/grafana/provisioning/notifiers"
       - name: RESOURCE
@@ -147,26 +180,28 @@ initContainers:
       {{- end }}
       {{- if .Values.sidecar.notifiers.searchNamespace }}
       - name: NAMESPACE
-        value: "{{ .Values.sidecar.notifiers.searchNamespace | join "," }}"
+        value: "{{ tpl (.Values.sidecar.notifiers.searchNamespace | join ",") . }}"
       {{- end }}
       {{- if .Values.sidecar.skipTlsVerify }}
       - name: SKIP_TLS_VERIFY
         value: "{{ .Values.sidecar.skipTlsVerify }}"
       {{- end }}
-{{- if .Values.sidecar.livenessProbe }}
+    {{- with .Values.sidecar.livenessProbe }}
     livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 6 }}
-{{- end }}
-{{- if .Values.sidecar.readinessProbe }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.readinessProbe }}
     readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.resources }}
     resources:
-{{ toYaml .Values.sidecar.resources | indent 6 }}
-{{- if .Values.sidecar.securityContext }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.securityContext }}
     securityContext:
-{{- toYaml .Values.sidecar.securityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: sc-notifiers-volume
         mountPath: "/etc/grafana/provisioning/notifiers"
@@ -194,6 +229,14 @@ containers:
     {{- end }}
     imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
     env:
+      {{- range $key, $value := .Values.sidecar.dashboards.env }}
+      - name: "{{ $key }}"
+        value: "{{ $value }}"
+      {{- end }}
+      {{- if .Values.sidecar.dashboards.ignoreAlreadyProcessed }}
+      - name: IGNORE_ALREADY_PROCESSED
+        value: "true"
+      {{- end }}
       - name: METHOD
         value: {{ .Values.sidecar.dashboards.watchMethod }}
       - name: LABEL
@@ -202,6 +245,10 @@ containers:
       - name: LABEL_VALUE
         value: {{ quote .Values.sidecar.dashboards.labelValue }}
       {{- end }}
+      {{- if or .Values.sidecar.logLevel .Values.sidecar.dashboards.logLevel }}
+      - name: LOG_LEVEL
+        value: {{ default .Values.sidecar.logLevel .Values.sidecar.dashboards.logLevel }}
+      {{- end }}
       - name: FOLDER
         value: "{{ .Values.sidecar.dashboards.folder }}{{- with .Values.sidecar.dashboards.defaultFolderName }}/{{ . }}{{- end }}"
       - name: RESOURCE
@@ -212,7 +259,7 @@ containers:
       {{- end }}
       {{- if .Values.sidecar.dashboards.searchNamespace }}
       - name: NAMESPACE
-        value: "{{ .Values.sidecar.dashboards.searchNamespace | join "," }}"
+        value: "{{ tpl (.Values.sidecar.dashboards.searchNamespace | join ",") . }}"
       {{- end }}
       {{- if .Values.sidecar.skipTlsVerify }}
       - name: SKIP_TLS_VERIFY
@@ -227,27 +274,35 @@ containers:
         value: "{{ .Values.sidecar.dashboards.script }}"
       {{- end }}
       {{- if .Values.sidecar.dashboards.watchServerTimeout }}
+      {{- if ne .Values.sidecar.dashboards.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.dashboards.watchServerTimeout with .Values.sidecar.dashboards.watchMethod %s" .Values.sidecar.dashboards.watchMethod) }}
+      {{- end }}
       - name: WATCH_SERVER_TIMEOUT
         value: "{{ .Values.sidecar.dashboards.watchServerTimeout }}"
       {{- end }}
       {{- if .Values.sidecar.dashboards.watchClientTimeout }}
+      {{- if ne .Values.sidecar.dashboards.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.dashboards.watchClientTimeout with .Values.sidecar.dashboards.watchMethod %s" .Values.sidecar.dashboards.watchMethod) }}
+      {{- end }}
       - name: WATCH_CLIENT_TIMEOUT
         value: "{{ .Values.sidecar.dashboards.watchClientTimeout }}"
       {{- end }}
-{{- if .Values.sidecar.livenessProbe }}
+    {{- with .Values.sidecar.livenessProbe }}
     livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 6 }}
-{{- end }}
-{{- if .Values.sidecar.readinessProbe }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.readinessProbe }}
     readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.resources }}
     resources:
-{{ toYaml .Values.sidecar.resources | indent 6 }}
-{{- if .Values.sidecar.securityContext }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.securityContext }}
     securityContext:
-{{- toYaml .Values.sidecar.securityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: sc-dashboard-volume
         mountPath: {{ .Values.sidecar.dashboards.folder | quote }}
@@ -258,12 +313,20 @@ containers:
 {{- if .Values.sidecar.datasources.enabled }}
   - name: {{ template "grafana.name" . }}-sc-datasources
     {{- if .Values.sidecar.image.sha }}
-    image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
     {{- else }}
-    image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
     {{- end }}
     imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
     env:
+      {{- range $key, $value := .Values.sidecar.datasources.env }}
+      - name: "{{ $key }}"
+        value: "{{ $value }}"
+      {{- end }}
+      {{- if .Values.sidecar.datasources.ignoreAlreadyProcessed }}
+      - name: IGNORE_ALREADY_PROCESSED
+        value: "true"
+      {{- end }}
       - name: METHOD
         value: {{ .Values.sidecar.datasources.watchMethod }}
       - name: LABEL
@@ -272,6 +335,10 @@ containers:
       - name: LABEL_VALUE
         value: {{ quote .Values.sidecar.datasources.labelValue }}
       {{- end }}
+      {{- if or .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }}
+      - name: LOG_LEVEL
+        value: {{ default .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }}
+      {{- end }}
       - name: FOLDER
         value: "/etc/grafana/provisioning/datasources"
       - name: RESOURCE
@@ -282,12 +349,16 @@ containers:
       {{- end }}
       {{- if .Values.sidecar.datasources.searchNamespace }}
       - name: NAMESPACE
-        value: "{{ .Values.sidecar.datasources.searchNamespace | join "," }}"
+        value: "{{ tpl (.Values.sidecar.datasources.searchNamespace | join ",") . }}"
       {{- end }}
       {{- if .Values.sidecar.skipTlsVerify }}
       - name: SKIP_TLS_VERIFY
         value: "{{ .Values.sidecar.skipTlsVerify }}"
       {{- end }}
+      {{- if .Values.sidecar.datasources.script }}
+      - name: SCRIPT
+        value: "{{ .Values.sidecar.datasources.script }}"
+      {{- end }}
       {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
@@ -308,20 +379,36 @@ containers:
       - name: REQ_METHOD
         value: POST
       {{- end }}
-{{- if .Values.sidecar.livenessProbe }}
+      {{- if .Values.sidecar.datasources.watchServerTimeout }}
+      {{- if ne .Values.sidecar.datasources.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.datasources.watchServerTimeout with .Values.sidecar.datasources.watchMethod %s" .Values.sidecar.datasources.watchMethod) }}
+      {{- end }}
+      - name: WATCH_SERVER_TIMEOUT
+        value: "{{ .Values.sidecar.datasources.watchServerTimeout }}"
+      {{- end }}
+      {{- if .Values.sidecar.datasources.watchClientTimeout }}
+      {{- if ne .Values.sidecar.datasources.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.datasources.watchClientTimeout with .Values.sidecar.datasources.watchMethod %s" .Values.sidecar.datasources.watchMethod) }}
+      {{- end }}
+      - name: WATCH_CLIENT_TIMEOUT
+        value: "{{ .Values.sidecar.datasources.watchClientTimeout }}"
+      {{- end }}
+    {{- with .Values.sidecar.livenessProbe }}
     livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 6 }}
-{{- end }}
-{{- if .Values.sidecar.readinessProbe }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.readinessProbe }}
     readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.resources }}
     resources:
-{{ toYaml .Values.sidecar.resources | indent 6 }}
-{{- if .Values.sidecar.securityContext }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.securityContext }}
     securityContext:
-{{- toYaml .Values.sidecar.securityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: sc-datasources-volume
         mountPath: "/etc/grafana/provisioning/datasources"
@@ -329,12 +416,20 @@ containers:
 {{- if .Values.sidecar.plugins.enabled }}
   - name: {{ template "grafana.name" . }}-sc-plugins
     {{- if .Values.sidecar.image.sha }}
-    image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
     {{- else }}
-    image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
     {{- end }}
     imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
     env:
+      {{- range $key, $value := .Values.sidecar.plugins.env }}
+      - name: "{{ $key }}"
+        value: "{{ $value }}"
+      {{- end }}
+      {{- if .Values.sidecar.plugins.ignoreAlreadyProcessed }}
+      - name: IGNORE_ALREADY_PROCESSED
+        value: "true"
+      {{- end }}
       - name: METHOD
         value: {{ .Values.sidecar.plugins.watchMethod }}
       - name: LABEL
@@ -343,6 +438,10 @@ containers:
       - name: LABEL_VALUE
         value: {{ quote .Values.sidecar.plugins.labelValue }}
       {{- end }}
+      {{- if or .Values.sidecar.logLevel .Values.sidecar.plugins.logLevel }}
+      - name: LOG_LEVEL
+        value: {{ default .Values.sidecar.logLevel .Values.sidecar.plugins.logLevel }}
+      {{- end }}
       - name: FOLDER
         value: "/etc/grafana/provisioning/plugins"
       - name: RESOURCE
@@ -353,7 +452,11 @@ containers:
       {{- end }}
       {{- if .Values.sidecar.plugins.searchNamespace }}
       - name: NAMESPACE
-        value: "{{ .Values.sidecar.plugins.searchNamespace | join "," }}"
+        value: "{{ tpl (.Values.sidecar.plugins.searchNamespace | join ",") . }}"
+      {{- end }}
+      {{- if .Values.sidecar.plugins.script }}
+      - name: SCRIPT
+        value: "{{ .Values.sidecar.plugins.script }}"
       {{- end }}
       {{- if .Values.sidecar.skipTlsVerify }}
       - name: SKIP_TLS_VERIFY
@@ -379,29 +482,45 @@ containers:
       - name: REQ_METHOD
         value: POST
       {{- end }}
-{{- if .Values.sidecar.livenessProbe }}
+      {{- if .Values.sidecar.plugins.watchServerTimeout }}
+      {{- if ne .Values.sidecar.plugins.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.plugins.watchServerTimeout with .Values.sidecar.plugins.watchMethod %s" .Values.sidecar.plugins.watchMethod) }}
+      {{- end }}
+      - name: WATCH_SERVER_TIMEOUT
+        value: "{{ .Values.sidecar.plugins.watchServerTimeout }}"
+      {{- end }}
+      {{- if .Values.sidecar.plugins.watchClientTimeout }}
+      {{- if ne .Values.sidecar.plugins.watchMethod "WATCH" }}
+        {{- fail (printf "Cannot use .Values.sidecar.plugins.watchClientTimeout with .Values.sidecar.plugins.watchMethod %s" .Values.sidecar.plugins.watchMethod) }}
+      {{- end }}
+      - name: WATCH_CLIENT_TIMEOUT
+        value: "{{ .Values.sidecar.plugins.watchClientTimeout }}"
+      {{- end }}
+    {{- with .Values.sidecar.livenessProbe }}
     livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 6 }}
-{{- end }}
-{{- if .Values.sidecar.readinessProbe }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.readinessProbe }}
     readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.resources }}
     resources:
-{{ toYaml .Values.sidecar.resources | indent 6 }}
-{{- if .Values.sidecar.securityContext }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.sidecar.securityContext }}
     securityContext:
-{{- toYaml .Values.sidecar.securityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: sc-plugins-volume
         mountPath: "/etc/grafana/provisioning/plugins"
 {{- end}}
   - name: {{ .Chart.Name }}
     {{- if .Values.image.sha }}
-    image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}"
     {{- else }}
-    image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+    image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
     {{- end }}
     imagePullPolicy: {{ .Values.image.pullPolicy }}
   {{- if .Values.command }}
@@ -410,10 +529,10 @@ containers:
       - {{ . }}
     {{- end }}
   {{- end}}
-{{- if .Values.containerSecurityContext }}
+    {{- with .Values.containerSecurityContext }}
     securityContext:
-{{- toYaml .Values.containerSecurityContext | nindent 6 }}
-{{- end }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     volumeMounts:
       - name: config
         mountPath: "/etc/grafana/grafana.ini"
@@ -466,6 +585,13 @@ containers:
         subPath: {{ . | quote }}
 {{- end }}
 {{- end }}
+{{- if .Values.alerting }}
+{{- range (keys .Values.alerting | sortAlpha) }}
+      - name: config
+        mountPath: "/etc/grafana/provisioning/alerting/{{ . }}"
+        subPath: {{ . | quote }}
+{{- end }}
+{{- end }}
 {{- if .Values.dashboardProviders }}
 {{- range (keys .Values.dashboardProviders | sortAlpha) }}
       - name: config
@@ -511,11 +637,8 @@ containers:
         mountPath: {{ .mountPath }}
     {{- end }}
     ports:
-      - name: {{ .Values.service.portName }}
-        containerPort: {{ .Values.service.targetPort }}
-        protocol: TCP
       - name: {{ .Values.podPortName }}
-        containerPort: 3000
+        containerPort: {{ .Values.service.targetPort }}
         protocol: TCP
     env:
       {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
@@ -595,15 +718,21 @@ containers:
           optional: {{ .optional | default false }}
     {{- end }}
     {{- end }}
+    {{- with .Values.livenessProbe }}
     livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.readinessProbe }}
     readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 {{- if .Values.lifecycleHooks }}
     lifecycle: {{ tpl (.Values.lifecycleHooks | toYaml) . | nindent 6 }}
 {{- end }}
+    {{- with .Values.resources }}
     resources:
-{{ toYaml .Values.resources | indent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 {{- with .Values.extraContainers }}
 {{ tpl . $ | indent 2 }}
 {{- end }}
@@ -616,6 +745,10 @@ nodeSelector: {{ include "linux-node-selector" . | nindent 2 }}
 affinity:
 {{ tpl (toYaml .) $root | indent 2 }}
 {{- end }}
+{{- with .Values.topologySpreadConstraints }}
+topologySpreadConstraints:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
 tolerations: {{ include "linux-node-tolerations" . | nindent 2 }}
 {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 2 }}
@@ -629,6 +762,9 @@ volumes:
   - name: {{ tpl .name $root }}
     configMap:
       name: {{ tpl .configMap $root }}
+      {{- if .items }}
+      items: {{ toYaml .items | nindent 6 }}
+      {{- end }}
 {{- end }}
   {{- if .Values.dashboards }}
     {{- range (keys .Values.dashboards | sortAlpha) }}
@@ -722,6 +858,9 @@ volumes:
     secret:
       secretName: {{ .secretName }}
       defaultMode: {{ .defaultMode }}
+      {{- if .items }}
+      items: {{ toYaml .items | nindent 6 }}
+      {{- end }}
 {{- else if .projected }}
   - name: {{ .name }}
     projected: {{- toYaml .projected | nindent 6 }}
@@ -738,6 +877,10 @@ volumes:
     {{- else if .hostPath }}
     hostPath:
       path: {{ .hostPath }}
+    {{- else if .csi }}
+    csi:
+      data:
+        {{ toYaml .data | nindent 6 }}
     {{- else }}
     emptyDir: {}
     {{- end }}
@@ -747,6 +890,6 @@ volumes:
     emptyDir: {}
 {{- end -}}
 {{- if .Values.extraContainerVolumes }}
-{{ toYaml .Values.extraContainerVolumes | indent 2 }}
+{{ tpl (toYaml .Values.extraContainerVolumes) . | indent 2 }}
 {{- end }}
 {{- end }}

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/templates/configmap-dashboard-provider.yaml

@@ -11,7 +11,6 @@ metadata:
   name: {{ template "grafana.fullname" . }}-config-dashboards
   namespace: {{ template "grafana.namespace" . }}
 data:
-  allow-snippet-annotations: "false"
   provider.yaml: |-
     apiVersion: 1
     providers:

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/templates/configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.createConfigmap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -10,7 +11,6 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 data:
-  allow-snippet-annotations: "false"
 {{- if .Values.plugins }}
   plugins: {{ join "," .Values.plugins }}
 {{- end }}
@@ -56,6 +56,14 @@ data:
   {{- end -}}
 {{- end -}}
 
+{{- if .Values.alerting }}
+{{ $root := . }}
+  {{- range $key, $value := .Values.alerting }}
+  {{ $key }}: |
+{{ tpl (toYaml $value | indent 4) $root }}
+  {{- end -}}
+{{- end -}}
+
 {{- if .Values.dashboardProviders }}
   {{- range $key, $value := .Values.dashboardProviders }}
   {{ $key }}: |
@@ -86,6 +94,12 @@ data:
         {{- if $value.token }}
     -H "Authorization: token {{ $value.token }}" \
         {{- end }}
+        {{- if $value.bearerToken }}
+    -H "Authorization: Bearer {{ $value.bearerToken }}" \
+        {{- end }}
+        {{- if $value.gitlabToken }}
+    -H "PRIVATE-TOKEN: {{ $value.gitlabToken }}" \
+        {{- end }}
     -H "Content-Type: application/json;charset=UTF-8" \
       {{ end }}
     {{- $dpPath := "" -}}
@@ -100,3 +114,4 @@ data:
     {{- end -}}
   {{- end }}
 {{- end }}
+{{- end }}

charts/rancher-monitoring/100.2.0+up40.1.2/charts/grafana/templates/deployment.yaml

@@ -46,5 +46,5 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
-      {{- include "grafana.pod" . | nindent 6 }}
+      {{- include "grafana.pod" . | indent 6 }}
 {{- end }}