diff options
Diffstat (limited to 'kud/tests/vnfs')
3 files changed, 30 insertions, 44 deletions
diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitor-collectd.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitor-collectd.yaml new file mode 100644 index 00000000..6bd961c0 --- /dev/null +++ b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitor-collectd.yaml @@ -0,0 +1,20 @@ +{{- if and .Values.prometheus.enabled .Values.prometheus.additionalServiceMonitors }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: service-monitor-collectd + namespace: {{ $.Release.Namespace | quote }} + labels: + app: {{ template "prometheus-operator.name" $ }}-prometheus +{{ include "prometheus-operator.labels" $ | indent 8 }} + collector: collectd +spec: + endpoints: + - interval : 10s + path: /metrics + port: collectd-prometheus + jobLabel: collectd + selector: + matchLabels: + app: collectd +{{- end }} diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitors.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitors.yaml deleted file mode 100755 index 4da752ff..00000000 --- a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/templates/prometheus/servicemonitors.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if and .Values.prometheus.enabled .Values.prometheus.additionalServiceMonitors }} -apiVersion: v1 -kind: List -items: -{{- range .Values.prometheus.additionalServiceMonitors }} - - apiVersion: monitoring.coreos.com/v1 - kind: ServiceMonitor - metadata: - name: {{ .name }} - namespace: {{ $.Release.Namespace | quote }} - labels: - app: {{ template "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.labels" $ | indent 8 }} - {{- if .additionalLabels }} -{{ toYaml .additionalLabels | indent 8 }} - {{- end }} - spec: - endpoints: -{{ toYaml .endpoints | indent 8 }} - {{- if .jobLabel }} - jobLabel: {{ .jobLabel }} - {{- end }} - {{- if .namespaceSelector }} - namespaceSelector: -{{ toYaml .namespaceSelector | indent 8 }} - {{- end }} - selector: -{{ toYaml .selector | indent 8 }} - {{- if .targetLabels }} - targetLabels: -{{ toYaml .targetLabels | indent 8 }} - {{- end }} -{{- end }} -{{- end }} diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/values.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/values.yaml index d493e23e..f4332e7f 100755 --- a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/values.yaml +++ b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus-operator/values.yaml @@ -474,7 +474,7 @@ alertmanager: ## Using default values from https://github.com/helm/charts/blob/master/stable/grafana/values.yaml ## grafana: - enabled: true + enabled: false ## Deploy default dashboards. ## @@ -567,7 +567,7 @@ grafana: ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## interval: "" - selfMonitor: true + selfMonitor: false ## metric relabel configs to apply to samples before ingestion. ## @@ -589,7 +589,7 @@ grafana: ## Component scraping the kube api server ## kubeApiServer: - enabled: true + enabled: false tlsConfig: serverName: kubernetes insecureSkipVerify: false @@ -626,7 +626,7 @@ kubeApiServer: ## Component scraping the kubelet and kubelet-hosted cAdvisor ## kubelet: - enabled: true + enabled: false namespace: kube-system serviceMonitor: @@ -698,7 +698,7 @@ kubelet: ## Component scraping the kube controller manager ## kubeControllerManager: - enabled: true + enabled: false ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## @@ -751,7 +751,7 @@ kubeControllerManager: ## Component scraping coreDns. Use either this or kubeDns ## coreDns: - enabled: true + enabled: false service: port: 9153 targetPort: 9153 @@ -831,7 +831,7 @@ kubeDns: ## Component scraping etcd ## kubeEtcd: - enabled: true + enabled: false ## If your etcd is not deployed as a pod, specify IPs it can be found on ## @@ -891,7 +891,7 @@ kubeEtcd: ## Component scraping kube scheduler ## kubeScheduler: - enabled: true + enabled: false ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## @@ -944,7 +944,7 @@ kubeScheduler: ## Component scraping kube proxy ## kubeProxy: - enabled: true + enabled: false ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## @@ -2030,4 +2030,4 @@ prometheus: ## Endpoints of the selected pods to be monitored ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#podmetricsendpoint ## - # podMetricsEndpoints: []
\ No newline at end of file + # podMetricsEndpoints: [] |