X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fosm_pods%2Fng-prometheus.yaml;h=0172aafd8be3450c5eca80a4844b8c716a0cd1d2;hb=cb7dc67d460141b98472561ce080cf378c9cd785;hp=56aca67d805e2929192122cb630e5c1dc679a0ac;hpb=3a1db657765884d4fd6dec4f0eba2e6996f445ad;p=osm%2Fdevops.git

diff --git a/installers/docker/osm_pods/ng-prometheus.yaml b/installers/docker/osm_pods/ng-prometheus.yaml
index 56aca67d..0172aafd 100644
--- a/installers/docker/osm_pods/ng-prometheus.yaml
+++ b/installers/docker/osm_pods/ng-prometheus.yaml
@@ -36,7 +36,7 @@ data:
       - name: osm_rules
         rules:
         - record: vm_status_extended
-          expr: (last_over_time(vm_status[1m]) * on (vm_id, vim_id) group_left(ns_id, vnf_id, vdu_id, project_id, job) last_over_time(ns_topology[1m])) or (last_over_time(ns_topology[1m]) * -1)
+          expr: (last_over_time(vm_status[1m]) * on (vm_id, vim_id) group_left(ns_id, vnf_id, vdu_id, project_id, job, vdu_name, vnf_member_index) last_over_time(ns_topology[1m])) or (last_over_time(ns_topology[1m]) * -1)
           labels:
             job: osm_prometheus
         - record: vnf_status
@@ -85,6 +85,9 @@ data:
     # A scrape configuration containing exactly one endpoint to scrape:
     # Here it's Prometheus itself.
     scrape_configs:
+      - job_name: 'mon_exporter'
+        static_configs:
+        - targets: ['mon:8000']
       - job_name: pushgateway
         honor_labels: true
         scrape_interval: 30s
@@ -137,7 +140,7 @@ spec:
         - name: prom-db
           mountPath: /prometheus
       - name: prometheus-config-sidecar
-        image: opensourcemano/prometheus:12
+        image: opensourcemano/prometheus:13
         env:
         - name: MONGODB_URL
           value: mongodb://mongodb-k8s:27017/?replicaSet=rs0