Browse Source

Merge pull request #9031 from pgier/upgrade-node-exporter-0.16.0

prometheus: upgrade prometheus components
OpenShift Merge Robot 6 years ago
parent
commit
b45b01004f

+ 3 - 8
roles/openshift_prometheus/defaults/main.yaml

@@ -8,10 +8,10 @@ openshift_prometheus_namespace: openshift-metrics
 # Need to standardise these tags
 l_openshift_prometheus_version_dict:
   origin:
-    prometheus: 'v2.2.1'
-    alert_manager: 'v0.14.0'
+    prometheus: 'v2.3.1'
+    alert_manager: 'v0.15.0'
     alert_buffer: 'v0.0.2'
-    node_exporter: 'v0.15.2'
+    node_exporter: 'v0.16.0'
   openshift-enterprise:
     prometheus: "{{ openshift_image_tag }}"
     alert_manager: "{{ openshift_image_tag }}"
@@ -41,11 +41,6 @@ openshift_prometheus_hostname: prometheus-{{openshift_prometheus_namespace}}.{{o
 openshift_prometheus_alerts_hostname: alerts-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}
 openshift_prometheus_alertmanager_hostname: alertmanager-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}
 
-l_openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default('v2.2.1') }}"
-l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v0.14.0') }}"
-l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default('v0.0.2') }}"
-l_openshift_prometheus_node_exporter_image_version: "{{ openshift_prometheus_node_exporter_image_version | default('v0.15.2') }}"
-
 openshift_prometheus_node_selector: "{{ openshift_hosted_infra_selector | default('node-role.kubernetes.io/infra=true') | map_from_pairs }}"
 
 openshift_prometheus_service_port: 443

+ 1 - 1
roles/openshift_prometheus/files/node-exporter-template.yaml

@@ -11,7 +11,7 @@ metadata:
     openshift.io/provider-display-name: Red Hat, Inc.
 parameters:
 - name: IMAGE
-  value: openshift/prometheus-node-exporter:v0.15.2
+  value: openshift/prometheus-node-exporter:v0.16.0
 - name: MEMORY_REQUESTS
   value: 30Mi
 - name: CPU_REQUESTS