From 0ab1661aeeb0ccfe708e9d79917bd18fdadad13c Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 22 Feb 2022 14:23:57 +0100
Subject: [PATCH] Updated community installer to use grafana 8.1.1 and
 prometheus v2.28.1

Change-Id: If64a82ccd300a512e69156101ee413377aaa8f1b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 installers/docker/osm_pods/grafana.yaml    | 6 +++---
 installers/docker/osm_pods/prometheus.yaml | 2 +-
 installers/full_install_osm.sh             | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/installers/docker/osm_pods/grafana.yaml b/installers/docker/osm_pods/grafana.yaml
index 34b445df..00e46df4 100644
--- a/installers/docker/osm_pods/grafana.yaml
+++ b/installers/docker/osm_pods/grafana.yaml
@@ -154,7 +154,7 @@ spec:
           value: both
         - name: NAMESPACE
           value: monitoring
-        image: kiwigrid/k8s-sidecar:0.1.20
+        image: kiwigrid/k8s-sidecar:1.15.6
         imagePullPolicy: IfNotPresent
         name: grafana-sc-dashboard
         resources: {}
@@ -176,7 +176,7 @@ spec:
             secretKeyRef:
               key: admin-password
               name: grafana
-        image: grafana/grafana:6.3.5
+        image: grafana/grafana:8.1.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -234,7 +234,7 @@ spec:
           value: /etc/grafana/provisioning/datasources
         - name: RESOURCE
           value: both
-        image: kiwigrid/k8s-sidecar:0.1.20
+        image: kiwigrid/k8s-sidecar:1.15.6
         imagePullPolicy: IfNotPresent
         name: grafana-sc-datasources
         resources: {}
diff --git a/installers/docker/osm_pods/prometheus.yaml b/installers/docker/osm_pods/prometheus.yaml
index 431b9b3f..c5647599 100644
--- a/installers/docker/osm_pods/prometheus.yaml
+++ b/installers/docker/osm_pods/prometheus.yaml
@@ -115,7 +115,7 @@ spec:
             mountPath: /etc/prometheus_init
       containers:
       - name: prometheus
-        image: prom/prometheus:v2.4.3
+        image: prom/prometheus:v2.28.1
         args:
         - --config.file=/etc/prometheus/prometheus.yml
         - --web.enable-lifecycle
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index d21b6ce8..3084207a 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -265,6 +265,7 @@ function generate_docker_images() {
 
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q GRAFANA ; then
         sg docker -c "docker pull grafana/grafana:${GRAFANA_TAG}" || FATAL "cannot get grafana docker image"
+        sg docker -c "docker pull kiwigrid/k8s-sidecar:${KIWIGRID_K8S_SIDECAR_TAG}" || FATAL "cannot get kiwigrid k8s-sidecar docker image"
     fi
 
     if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then
@@ -929,8 +930,9 @@ OSM_DOCKER_TAG=latest
 DOCKER_USER=opensourcemano
 PULL_IMAGES="y"
 KAFKA_TAG=2.11-1.0.2
-PROMETHEUS_TAG=v2.4.3
-GRAFANA_TAG=latest
+KIWIGRID_K8S_SIDECAR_TAG="1.15.6"
+PROMETHEUS_TAG=v2.28.1
+GRAFANA_TAG=8.1.1
 PROMETHEUS_NODE_EXPORTER_TAG=0.18.1
 PROMETHEUS_CADVISOR_TAG=latest
 KEYSTONEDB_TAG=10
-- 
2.17.1