Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump grafana version to 7.3.5 #3006

Merged
merged 2 commits into from
Jan 4, 2021
Merged

Bump grafana version to 7.3.5 #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8871eb
Revert "build: Add custom grafana build image with plugins installed"
TeddyAndrieux Jan 4, 2021
8bf0566
build,salt,charts: Bump grafana image to 7.3.5
TeddyAndrieux Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
bump the version to 12.2.3.
All the container images of this stack have also been bumped:
- alertmanager from v0.20.0 to v0.21.0
- grafana from 6.7.4 to 7.2.1
- grafana from 6.7.4 to 7.3.5 (PR [#3006](https://github.com/scality/metalk8s/pull/3006))
- k8s-sidecar from 0.1.20 to 1.1.0
- kube-state-metrics from v1.9.5 to v1.9.7
- node-exporter from v0.18.1 to v1.0.1
Expand Down
5 changes: 1 addition & 4 deletions buildchain/buildchain/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
'nginx-ingress-defaultbackend-amd64',
],
constants.GRAFANA_REPOSITORY: [
'grafana',
'loki',
'fluent-bit-plugin-loki',
],
Expand Down Expand Up @@ -227,10 +228,6 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
# }}}
# Container images to build {{{
TO_BUILD : Tuple[targets.LocalImage, ...] = (
_local_image(
name='grafana',
build_args={'GRAFANA_IMAGE_VERSION': versions.GRAFANA_IMAGE_VERSION},
),
_local_image(
name='salt-master',
build_args={'SALT_VERSION': versions.SALT_VERSION},
Expand Down
11 changes: 5 additions & 6 deletions buildchain/buildchain/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def load_version_information() -> None:
CENTOS_BASE_IMAGE_SHA256 : str = \
'6ae4cddb2b37f889afd576a17a5286b311dcbf10a904409670827f6f9b50065e'

GRAFANA_IMAGE_VERSION : str = '7.2.1'
NGINX_IMAGE_VERSION : str = '1.15.8'
NODEJS_IMAGE_VERSION : str = '10.16.0'

Expand Down Expand Up @@ -114,6 +113,11 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
version='3.4.3-0',
digest='sha256:4afb99b4690b418ffc2ceb67e1a17376457e441c1f09ab55447f0aaf992fa646',
),
Image(
name='grafana',
version='7.3.5',
digest='sha256:511bc20bfcd1b79f3947bb1c33d152f7484e7a91418883fb4dddf71274227321',
),
Image(
name='k8s-sidecar',
version='1.1.0',
Expand Down Expand Up @@ -190,11 +194,6 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
digest='sha256:240b10b07e15e95c3009da938e3abb8bef2fa47ea1f719ae58f7dd116bcb2f10',
),
# Local images
Image(
name='grafana',
version=GRAFANA_IMAGE_VERSION,
digest=None,
),
Image(
name='metalk8s-ui',
version=VERSION,
Expand Down
6 changes: 6 additions & 0 deletions charts/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ grafana:

image:
repository: '__image__(grafana)'
# NOTE: We do not use the image version in the helm chart as currently
# helm chart use version 7.2.1 and this version have the following bug
# https://github.com/grafana/grafana/issues/28621 which get fixed in
# 7.3.1
# Set the version to 7.3.5
tag: 7.3.5

sidecar:
image:
Expand Down
12 changes: 0 additions & 12 deletions images/grafana/Dockerfile
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions images/grafana/README.md
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18363,7 +18363,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -18616,7 +18616,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -18708,7 +18708,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -18736,7 +18736,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana-config-dashboards
Expand Down Expand Up @@ -18778,7 +18778,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -52415,7 +52415,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana-clusterrole
Expand Down Expand Up @@ -52863,7 +52863,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana-clusterrolebinding
Expand Down Expand Up @@ -53038,7 +53038,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -53084,7 +53084,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -53128,7 +53128,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down Expand Up @@ -53496,7 +53496,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand All @@ -53517,8 +53517,8 @@ spec:
apiVersion="v1", namespace="metalk8s-monitoring", name="prometheus-operator-grafana",
path="data:grafana.ini")
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: a268d620e15b10fedc83cd59ec005813f27e566373a36d45477ada6615a1c372
checksum/secret: 0c4c165b5b14666860b2bca141aa397e4f07db9865215a877b5b1f3ee47fa41c
checksum/sc-dashboard-provider-config: 17700f61718b97880099e76e17b572f81e76ca8d993efce281f5187b514f9c55
checksum/secret: 7ac5e16f07f2ce71a66e5450c04dfb617778e7294a4c8400e653dd797acd6b03
labels:
app.kubernetes.io/instance: prometheus-operator
app.kubernetes.io/name: grafana
Expand Down Expand Up @@ -53551,7 +53551,7 @@ spec:
secretKeyRef:
key: admin-password
name: prometheus-operator-grafana
image: {% endraw -%}{{ build_image_name("grafana", False) }}{%- raw %}:7.2.1
image: {% endraw -%}{{ build_image_name("grafana", False) }}{%- raw %}:7.3.5
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 10
Expand Down Expand Up @@ -53791,7 +53791,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: metalk8s
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.3.5
helm.sh/chart: grafana-5.8.16
heritage: metalk8s
name: prometheus-operator-grafana
Expand Down