Browse Source

Fix proxy for Grafana script

The prometheus/grafana script needs to download a grafana json
file by curl which doesn't work since the proxy issue. This patch
fixes it.

Task: 38167
Story: 2007005

Change-Id: I51ba108e23524eecc04bbbd47a5b50b8d4a529f9
(cherry picked from commit 4346d776e5887af71e33748212bf4dcc2a220b66)
changes/66/705466/1
Feilong Wang Spyros Trigazis 1 month ago
parent
commit
84cd9ca381
2 changed files with 16 additions and 0 deletions
  1. +12
    -0
      magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
  2. +4
    -0
      releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml

+ 12
- 0
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh View File

@@ -5,6 +5,18 @@ printf "Starting to run ${step}\n"

. /etc/sysconfig/heat-params

if [ ! -z "$HTTP_PROXY" ]; then
export HTTP_PROXY
fi

if [ ! -z "$HTTPS_PROXY" ]; then
export HTTPS_PROXY
fi

if [ ! -z "$NO_PROXY" ]; then
export NO_PROXY
fi

function writeFile {
# $1 is filename
# $2 is file content


+ 4
- 0
releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml View File

@@ -0,0 +1,4 @@
---
fixes:
- |
This proxy issue of Prometheus/Grafana script has been fixed.

Loading…
Cancel
Save