Merge pull request #33 from camilb/release-2

Release 2.0
camilb · Nov 8, 2017 · e651f49 · e651f49
2 parents 1286336 + 8697a9b
commit e651f49
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/deploy b/deploy
@@ -3,11 +3,11 @@
 #########################################################################################
 #components default version
 #########################################################################################
-GRAFANA_DEFAULT_VERSION=4.6.0-beta3
-PROMETHEUS_DEFAULT_VERSION=v2.0.0-rc.2
+GRAFANA_DEFAULT_VERSION=4.6.1
+PROMETHEUS_DEFAULT_VERSION=v2.0.0
 PROMETHEUS_OPERATOR_DEFAULT_VERSION=v0.14.0
 ALERTMANAGER_DEFAULT_VERSION=v0.9.1
-NODE_EXPORTER_DEFAULT_VERSION=v0.15.0
+NODE_EXPORTER_DEFAULT_VERSION=v0.15.1
 KUBE_STATE_METRICS_DEFAULT_VERSION=v1.1.0
 
 #########################################################################################

diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -507,21 +507,21 @@ data:
           description: '{{ $labels.node }} is under disk pressure.'
           summary: Node is under disk pressure.
       - alert: NodeCPUUsage
-        expr: (100 - (avg by (instance) (irate(node_cpu{job="node-exporter",mode="idle"}[5m])) * 100)) > 80
+        expr: (100 - (avg by (instance) (irate(node_cpu{job="node-exporter",mode="idle"}[5m])) * 100)) > 90
         for: 30m
         labels:
           severity: warning
         annotations:
           summary: "{{$labels.instance}}: High CPU usage detected"
-          description: "{{$labels.instance}}: CPU usage is above 85% (current value is: {{ $value }})"
+          description: "{{$labels.instance}}: CPU usage is above 90% (current value is: {{ $value }})"
       - alert: NodeMemoryUsage
-        expr: (((node_memory_MemTotal-node_memory_MemFree-node_memory_Cached)/(node_memory_MemTotal)*100)) > 85
+        expr: (((node_memory_MemTotal-node_memory_MemFree-node_memory_Cached)/(node_memory_MemTotal)*100)) > 90
         for: 30m
         labels:
           severity: warning
         annotations:
           summary: "{{$labels.instance}}: High memory usage detected"
-          description: "{{$labels.instance}}: Memory usage is above 85% (current value is: {{ $value }})"
+          description: "{{$labels.instance}}: Memory usage is above 90% (current value is: {{ $value }})"
   prometheus.rules: |+
     groups:
     - name: prometheus.rules

diff --git a/release/download b/release/download
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-PROMKUBE_VERSION=${PROMKUBE_VERSION:-2.0.0-beta.5}
+PROMKUBE_VERSION=${PROMKUBE_VERSION:-2.0.0}
 
 NAME="prometheus-kubernetes"