github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding support for externally defined adapter rules (#8959)

Browse Source 
* Adding support for externally defined adapter rules

Signed-off-by: Justin McCarty <justin.mccarty@syapse.com>

* Adding comment in values for the existing rules entry

Signed-off-by: Justin McCarty <justin.mccarty@syapse.com>

* Removing trailing space

Signed-off-by: Justin McCarty <justin.mccarty@syapse.com>
This commit is contained in:
Justin McCarty
2019-01-02 11:01:35 -08:00
committed by Kubernetes Prow Robot
parent 8769497e64
commit 7dbf0a9f10
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-adapter/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: prometheus-adapter
version: v0.2.3
version: v0.3.0
appVersion: v0.4.1
description: A Helm chart for k8s prometheus adapter
home: https://github.com/DirectXMan12/k8s-prometheus-adapter
stable/prometheus-adapter/README.md
+1
View File
@@ -49,6 +49,7 @@ The following table lists the configurable parameters of the Prometheus Adapter
| `resources` | CPU/Memory resource requests/limits | `{}` |
| `rules.default` | If `true`, enable a set of default rules in the configmap | `true` |
| `rules.custom` | A list of custom configmap rules | `[]` |
| `rules.existing` | The name of an existing configMap with rules. Overrides default and custom. | `` |
| `service.annotations` | Annotations to add to the service | `{}` |
| `service.port` | Service port to expose | `443` |
| `service.type` | Type of service to create | `ClusterIP` |
stable/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml
+4
View File
@@ -95,7 +95,11 @@ spec:
volumes:
- name: config
configMap:
{{- if .Values.rules.existing }}
name: {{ .Values.rules.existing }}
{{- else }}
name: {{ template "k8s-prometheus-adapter.fullname" . }}
{{- end }}
- name: tmp
emptyDir: {}
{{- if .Values.tls.enable }}
stable/prometheus-adapter/templates/custom-metrics-configmap.yaml
+2 -1
View File
@@ -1,3 +1,4 @@
{{- if not .Values.rules.existing -}}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -81,4 +82,4 @@ data:
{{- if .Values.rules.custom }}
{{ toYaml .Values.rules.custom | indent 4 }}
{{- end -}}
{{- end -}}
stable/prometheus-adapter/values.yaml
+3
View File
@@ -48,6 +48,9 @@ rules:
# matches: ""
# as: "my_custom_metric"
# metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>)
# Mounts a configMap with pre-generated rules for use. Overrides the
# default and custom entries
existing:
service:
annotations: {}