From daee5a9d6059c247ea33b9ea3235d2d6c1caf724 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Mon, 25 Feb 2019 21:43:43 -0800
Subject: [PATCH] Update Grafana from v6.0.0-beta3 to v6.0.0

* https://github.com/grafana/grafana/releases/tag/v6.0.0
* http://docs.grafana.org/guides/whats-new-in-v6-0/
---
 CHANGES.md                     | 2 +-
 addons/grafana/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d2df3d70..d011f006 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,7 @@ Notable changes between versions.
   * Add `pod` name label to metrics discovered via service endpoints
   * Rename `kubernetes_namespace` label to `namespace`
 * Improve Grafana and dashboards ([#403](https://github.com/poseidon/typhoon/pull/403), [#404](https://github.com/poseidon/typhoon/pull/404))
-  * Upgrade Grafana from v5.4.3 to 6.0.0-beta3
+  * Upgrade Grafana from v5.4.3 to [v6.0.0](https://github.com/grafana/grafana/releases/tag/v6.0.0)!
   * Enable Grafana [Explore](http://docs.grafana.org/guides/whats-new-in-v6-0/#explore) UI as a Viewer (inspect/edit without saving)
 * Raise nginx-ingress liveness/readiness timeout to 5 seconds
 * Remove nginx-ingess default-backend ([#401](https://github.com/poseidon/typhoon/pull/401))
diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml
index 5c5998f0..dfcfe9bc 100644
--- a/addons/grafana/deployment.yaml
+++ b/addons/grafana/deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: grafana
-          image: grafana/grafana:6.0.0-beta3
+          image: grafana/grafana:6.0.0
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"