From f11447d127d21dd56b302fe1014f4801d32511c5 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 26 Mar 2020 14:20:56 +0100 Subject: Fix spacing issues in YAML files in vnfs Fixes applied as reported by yamllint. Change-Id: I8bd30d49e728715fdc696bb984fbca842ac1c2b8 Issue-ID: INT-1482 Signed-off-by: Bartek Grzybowski --- .../charts/prometheus-operator/templates/alertmanager/ingress.yaml | 2 +- .../prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml | 2 +- .../operator/charts/prometheus-operator/templates/alertmanager/psp.yaml | 1 - .../charts/prometheus-operator/templates/alertmanager/secret.yaml | 2 +- .../prometheus-operator/templates/grafana/configmaps-datasources.yaml | 2 +- .../charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml | 2 +- .../templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml | 2 +- .../prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml | 2 +- .../templates/grafana/dashboards/k8s-node-rsrc-use.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-cluster.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-namespace.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-pod.yaml | 2 +- .../charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml | 2 +- .../templates/grafana/dashboards/persistentvolumesusage.yaml | 2 +- .../charts/prometheus-operator/templates/grafana/dashboards/pods.yaml | 2 +- .../prometheus-operator/templates/grafana/dashboards/statefulset.yaml | 2 +- .../prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml | 2 +- .../prometheus-operator/templates/prometheus-operator/clusterrole.yaml | 2 +- .../templates/prometheus-operator/crd-prometheusrules.yaml | 2 +- .../templates/prometheus-operator/servicemonitor.yaml | 2 +- .../templates/prometheus/additionalAlertRelabelConfigs.yaml | 2 +- .../templates/prometheus/additionalAlertmanagerConfigs.yaml | 2 +- .../templates/prometheus/additionalScrapeConfigs.yaml | 2 +- .../charts/prometheus-operator/templates/prometheus/clusterrole.yaml | 2 +- .../prometheus-operator/templates/prometheus/clusterrolebinding.yaml | 1 - .../charts/prometheus-operator/templates/prometheus/ingress.yaml | 2 +- .../prometheus-operator/templates/prometheus/podDisruptionBudget.yaml | 2 +- .../charts/prometheus-operator/templates/prometheus/prometheus.yaml | 2 +- .../templates/prometheus/psp-clusterrolebinding.yaml | 1 - .../charts/prometheus-operator/templates/prometheus/role-config.yaml | 2 +- .../templates/prometheus/role-specificNamespace.yaml | 2 +- .../templates/prometheus/rolebinding-specificNamespace.yaml | 2 +- .../templates/prometheus/rules/alertmanager.rules.yaml | 2 +- .../charts/prometheus-operator/templates/prometheus/rules/etcd.yaml | 2 +- .../prometheus-operator/templates/prometheus/rules/general.rules.yaml | 2 +- .../prometheus-operator/templates/prometheus/rules/k8s.rules.yaml | 2 +- .../templates/prometheus/rules/kube-apiserver.rules.yaml | 2 +- .../templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml | 2 +- .../prometheus/rules/kube-prometheus-node-recording.rules.yaml | 2 +- .../templates/prometheus/rules/kube-scheduler.rules.yaml | 2 +- .../templates/prometheus/rules/kubernetes-absent.yaml | 2 +- .../prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml | 2 +- .../templates/prometheus/rules/kubernetes-resources.yaml | 2 +- .../templates/prometheus/rules/kubernetes-storage.yaml | 2 +- .../templates/prometheus/rules/kubernetes-system.yaml | 2 +- .../prometheus-operator/templates/prometheus/rules/node.rules.yaml | 2 +- .../templates/prometheus/rules/prometheus-operator.yaml | 2 +- .../templates/prometheus/rules/prometheus.rules.yaml | 2 +- 48 files changed, 45 insertions(+), 48 deletions(-) (limited to 'vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates') diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml index fd657f71..b0c8d85f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml @@ -30,4 +30,4 @@ spec: tls: {{ toYaml .Values.alertmanager.ingress.tls | indent 4 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml index f240fe76..3b47e7bf 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml @@ -17,4 +17,4 @@ spec: matchLabels: app: alertmanager alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml index 01eda240..29ddcf85 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml @@ -45,4 +45,3 @@ spec: max: 65535 readOnlyRootFilesystem: false {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml index e73c465f..c6dfbd56 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml @@ -11,4 +11,4 @@ data: {{- range $key, $val := .Values.alertmanager.templateFiles }} {{ $key }}: {{ $val | b64enc | quote }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml index 5b8b54c4..6719e09f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml @@ -16,4 +16,4 @@ data: url: http://{{ template "prometheus-operator.fullname" . }}-prometheus:9090/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: true -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml index 161b1907..ff37bf76 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml @@ -1107,4 +1107,4 @@ data: "title": "etcd", "version": 215 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index 5792140e..d5304846 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -923,4 +923,4 @@ data: "uid": "a6e7d1362e1ddbb79db21d5bb40d7137", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml index b638913e..2f625c2c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml @@ -1320,4 +1320,4 @@ data: "uid": "vkQ0UHxik", "version": 1 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 19394efe..426e63a1 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -950,4 +950,4 @@ data: "uid": "4ac4f123aae0ff6dbaf4f4f66120033b", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml index 2f61ac42..b4643ebe 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1335,4 +1335,4 @@ data: "uid": "efa86fd1d0c121a26444b636a3f509a8", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml index fae35be8..de4abc37 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -846,4 +846,4 @@ data: "uid": "85a562078cdf77779eaa1add43ccec1e", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml index 1678a051..12efecff 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -873,4 +873,4 @@ data: "uid": "6581e46e4e5c7ba40a07646395ef7b23", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml index ebc112c0..3529e7c9 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml @@ -1325,4 +1325,4 @@ data: "uid": "fa49a4706d07a042595b664c87fb33ea", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml index fe32a013..d6165711 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -356,4 +356,4 @@ data: "uid": "919b92a8e8041bd567af9edab12c840c", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml index f2bc6c40..de5a5cbf 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml @@ -497,4 +497,4 @@ data: "uid": "ab4f13a9892a76a4d21ce8c2445bf4ea", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml index 6195833d..a53a36cb 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml @@ -870,4 +870,4 @@ data: "uid": "a31c1f46e6f727cb37c0d731a7245005", "version": 0 } -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml index 297e8391..d001f69b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml @@ -40,4 +40,4 @@ spec: kubectl delete crd prometheusrules.monitoring.coreos.com; kubectl delete crd servicemonitors.monitoring.coreos.com; restartPolicy: OnFailure -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml index 594a2019..38aa2c4c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml @@ -68,4 +68,4 @@ rules: - get - list - watch -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml index 9839687e..3efdc21f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml @@ -357,4 +357,4 @@ spec: - rules type: array version: v1 -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml index 9532c1f9..aebbcf7b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml @@ -17,4 +17,4 @@ spec: namespaceSelector: matchNames: - {{ .Release.Namespace | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml index 1c54f40b..023e7a4f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alert-relabel-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml index 4475e7bd..eba6e091 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alertmanager-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml index 9d6bb616..4ac56ced 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-scrape-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalScrapeConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml index 799027d9..d19a69db 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml @@ -32,4 +32,4 @@ rules: verbs: ["get", "list", "watch"] - nonResourceURLs: ["/metrics"] verbs: ["get"] -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml index b0c0e9e1..67b129b2 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml @@ -15,4 +15,3 @@ subjects: name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml index e013e960..ee1434c6 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml @@ -30,4 +30,4 @@ spec: tls: {{ toYaml .Values.prometheus.ingress.tls | indent 4 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml index a51cda5d..f5aea442 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml @@ -17,4 +17,4 @@ spec: matchLabels: app: prometheus prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml index c172c0e3..eb2a955e 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml @@ -103,7 +103,7 @@ spec: ruleSelector: {{ toYaml .Values.prometheus.prometheusSpec.ruleSelector | indent 4}} {{- else if .Values.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues }} - ruleSelector: + ruleSelector: matchLabels: app: {{ template "prometheus-operator.name" . }} release: {{ .Release.Name | quote }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml index 08faa722..a9e5d83a 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml @@ -15,4 +15,3 @@ subjects: name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml index eef28dad..00a2e8bc 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml @@ -13,4 +13,4 @@ rules: - configmaps verbs: - get -{{- end}} \ No newline at end of file +{{- end}} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml index 9fe3f20e..3c359d4c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml @@ -24,4 +24,4 @@ items: - list - watch {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml index 64161876..366c5df0 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml @@ -20,4 +20,4 @@ items: name: {{ template "prometheus-operator.prometheus.serviceAccountName" $ }} namespace: {{ $.Release.Namespace }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml index c1762fd1..75f9ef02 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml @@ -47,4 +47,4 @@ spec: for: 5m labels: severity: critical -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml index a68eeff2..381c5efe 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml @@ -133,4 +133,4 @@ spec: for: 10m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml index 9f8349f9..431270a1 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml @@ -43,4 +43,4 @@ spec: expr: vector(1) labels: severity: none -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml index 678df008..ffc43130 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml @@ -57,4 +57,4 @@ spec: label_replace(kube_pod_labels{job="kube-state-metrics"}, "pod_name", "$1", "pod", "(.*)") ) record: namespace_name:kube_pod_container_resource_requests_cpu_cores:sum -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml index cbb19cb7..cd9b9768 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -32,4 +32,4 @@ spec: labels: quantile: '0.5' record: cluster_quantile:apiserver_request_latencies:histogram_quantile -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 2df9a096..a66e0685 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -34,4 +34,4 @@ spec: for: 10m labels: severity: critical -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index 0d2ff510..b68a3845 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -34,4 +34,4 @@ spec: record: cluster:node_cpu:sum_rate5m - expr: cluster:node_cpu_seconds_total:rate5m / count(sum(node_cpu_seconds_total) BY (instance, cpu)) record: cluster:node_cpu:ratio -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml index e51b0181..f1eee9a2 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -56,4 +56,4 @@ spec: labels: quantile: '0.5' record: cluster_quantile:scheduler_binding_latency:histogram_quantile -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml index 19b09491..0115a8ef 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml @@ -120,4 +120,4 @@ spec: labels: severity: critical {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml index d3d2c498..970144ba 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml @@ -153,4 +153,4 @@ spec: for: 1h labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml index ed4a83c6..a281e49b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml @@ -96,4 +96,4 @@ spec: for: 15m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml index edd8f5fc..bb1e1125 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml @@ -55,4 +55,4 @@ spec: for: 5m labels: severity: critical -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml index 8ccfa5bf..488b778b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml @@ -116,4 +116,4 @@ spec: expr: histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400 labels: severity: critical -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml index 35245437..28159a22 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml @@ -195,4 +195,4 @@ spec: ) ) by (node) record: 'node:node_inodes_free:' -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml index 774a540c..d2a07a23 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml @@ -36,4 +36,4 @@ spec: for: 10m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml index 3c9e1490..5424d709 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml @@ -102,4 +102,4 @@ spec: for: 10m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} -- cgit 1.2.3-korg