EDGEPOD-34 Add ability to configure Grafana dashboards to import
Also, bump Prometheus and Grafana helm chart version.
Change-Id: I74ab2f8d70671fa3ccaf2efab2de107c0c5d47b5
diff --git a/nem-monitoring/values.yaml b/nem-monitoring/values.yaml
index 47b0682..6d9220e 100644
--- a/nem-monitoring/values.yaml
+++ b/nem-monitoring/values.yaml
@@ -26,7 +26,7 @@
nem_kpi_exporter_nodePort: 31080
nem_kpi_exporter_replicas: 2
kpi_broker: cord-kafka:9092
- topics:
+ topics:
- voltha.kpis
- onos.aaa.stats.kpis
- onos.kpis
@@ -35,184 +35,37 @@
alertmanager:
persistentVolume:
enabled: false
- nodeExporter:
- service:
- clusterIP: ""
server:
persistentVolume:
enabled: false
service:
type: NodePort
nodePort: 31301
- serverFiles:
- alerts: {}
- rules: {}
+ # The labels to add to any time series or alerts when communicating with
+ # external systems (federation, remote storage, Alertmanager).
+ #global:
+ # external_labels:
+ # datacenter: onf-menlo
- prometheus.yml:
- rule_files:
- - /etc/config/rules
- - /etc/config/alerts
-
- scrape_configs:
- # voltha KPI
- - job_name: 'voltha-kpi'
- metrics_path: /metrics
- scrape_interval: 15s
- static_configs:
- - targets:
- - kpi-exporter:8080
-
- # XOS-Core
- - job_name: 'xos-core'
- metrics_path: /metrics
- scrape_interval: 15s
- static_configs:
- - targets:
- - xos-core-prometheus:8000
-
- # NodeExporter
- - job_name: 'node-exporter'
- metrics_path: /metrics
- scrape_interval: 15s
- static_configs:
- - targets:
- - nem-monitoring-prometheus-node-exporter:9100
-
- # KB8s monitoring jobs
- - job_name: prometheus
- static_configs:
- - targets:
- - localhost:9090
- - job_name: 'kubernetes-apiservers'
- kubernetes_sd_configs:
- - role: endpoints
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- relabel_configs:
- - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
- action: keep
- regex: default;kubernetes;https
- - job_name: 'kubernetes-nodes'
- # Default to scraping over https. If required, just disable this or change to
- # `http`.
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- kubernetes_sd_configs:
- - role: node
- relabel_configs:
- - action: labelmap
- regex: __meta_kubernetes_node_label_(.+)
- - target_label: __address__
- replacement: kubernetes.default.svc:443
- - source_labels: [__meta_kubernetes_node_name]
- regex: (.+)
- target_label: __metrics_path__
- replacement: /api/v1/nodes/${1}/proxy/metrics
- - job_name: 'kubernetes-nodes-cadvisor'
- scheme: https
- tls_config:
- ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecure_skip_verify: true
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- kubernetes_sd_configs:
- - role: node
- relabel_configs:
- - action: labelmap
- regex: __meta_kubernetes_node_label_(.+)
- - target_label: __address__
- replacement: kubernetes.default.svc:443
- - source_labels: [__meta_kubernetes_node_name]
- regex: (.+)
- target_label: __metrics_path__
- replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
- - job_name: 'kubernetes-service-endpoints'
- kubernetes_sd_configs:
- - role: endpoints
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
- action: keep
- regex: true
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
- action: replace
- target_label: __scheme__
- regex: (https?)
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
- action: replace
- target_label: __metrics_path__
- regex: (.+)
- - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
- action: replace
- target_label: __address__
- regex: ([^:]+)(?::\d+)?;(\d+)
- replacement: $1:$2
- - action: labelmap
- regex: __meta_kubernetes_service_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- action: replace
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_service_name]
- action: replace
- target_label: kubernetes_name
- - job_name: 'prometheus-pushgateway'
- honor_labels: true
- kubernetes_sd_configs:
- - role: service
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
- action: keep
- regex: pushgateway
- - job_name: 'kubernetes-services'
- metrics_path: /probe
- params:
- module: [http_2xx]
- kubernetes_sd_configs:
- - role: service
- relabel_configs:
- - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
- action: keep
- regex: true
- - source_labels: [__address__]
- target_label: __param_target
- - target_label: __address__
- replacement: blackbox
- - source_labels: [__param_target]
- target_label: instance
- - action: labelmap
- regex: __meta_kubernetes_service_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_service_name]
- target_label: kubernetes_name
- - job_name: 'kubernetes-pods'
- kubernetes_sd_configs:
- - role: pod
- relabel_configs:
- - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
- action: keep
- regex: true
- - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
- action: replace
- target_label: __metrics_path__
- regex: (.+)
- - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
- action: replace
- regex: ([^:]+)(?::\d+)?;(\d+)
- replacement: $1:$2
- target_label: __address__
- - action: labelmap
- regex: __meta_kubernetes_pod_label_(.+)
- - source_labels: [__meta_kubernetes_namespace]
- action: replace
- target_label: kubernetes_namespace
- - source_labels: [__meta_kubernetes_pod_name]
- action: replace
- target_label: kubernetes_pod_name
+ extraScrapeConfigs: |
+ - job_name: 'xos-core'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - xos-core-prometheus:8000
+ - job_name: 'voltha-kpi'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - kpi-exporter:8080
+ - job_name: 'node-exporter'
+ metrics_path: /metrics
+ scrape_interval: 15s
+ static_configs:
+ - targets:
+ - nem-monitoring-prometheus-node-exporter:9100
grafana:
adminUser: admin
@@ -230,6 +83,16 @@
datasources:
- name: Prometheus
type: prometheus
- url: http://nem-monitoring-prometheus-server.default.svc.cluster.local
+ url: http://nem-monitoring-prometheus-server
access: proxy
isDefault: true
+
+# Configure Grafana dashboard to import
+dashboards:
+ k8s: true
+ nodeExporter: true
+ xos: true
+ onos: true
+ aaa: true
+ voltha: true
+ omec: false