From fd2e852050b4e3a720d3ecd30a1a57913abaaee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 30 Nov 2018 18:34:08 +0000
Subject: [PATCH] feat(ui): consumer Alertmanager version and cluster members

---
 .../AlertGrid/AlertGroup/Silence/index.test.js   |  8 ++++++--
 .../SilenceModal/AlertManagerInput/index.test.js | 16 ++++++++++++----
 .../SilenceSubmit/SilenceSubmitProgress.test.js  |  4 +++-
 ui/src/Models/API.js                             |  4 +++-
 ui/src/__mocks__/Alerts.js                       |  4 +++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
index d5276ab4f..1696bfb9b 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
@@ -64,7 +64,9 @@ beforeEach(() => {
         name: "default",
         uri: "file:///mock",
         publicURI: "http://example.com",
-        error: ""
+        error: "",
+        version: "0.15.0",
+        clusterMembers: ["default"]
       }
     ]
   };
@@ -186,7 +188,9 @@ describe("<Silence />", () => {
       name: "default",
       uri: "file:///mock",
       publicURI: "http://example.com",
-      error: ""
+      error: "",
+      version: "0.15.0",
+      clusterMembers: ["default"]
     });
   });
 
diff --git a/ui/src/Components/SilenceModal/AlertManagerInput/index.test.js b/ui/src/Components/SilenceModal/AlertManagerInput/index.test.js
index c11c6f25d..053baef9c 100644
--- a/ui/src/Components/SilenceModal/AlertManagerInput/index.test.js
+++ b/ui/src/Components/SilenceModal/AlertManagerInput/index.test.js
@@ -23,19 +23,25 @@ beforeEach(() => {
       name: "am1",
       uri: "http://am1.example.com",
       publicURI: "http://am1.example.com",
-      error: ""
+      error: "",
+      version: "0.15.0",
+      clusterMembers: ["am1"]
     },
     {
       name: "am2",
       uri: "http://am2.example.com",
       publicURI: "http://am2.example.com",
-      error: ""
+      error: "",
+      version: "0.15.0",
+      clusterMembers: ["am2"]
     },
     {
       name: "am3",
       uri: "http://am3.example.com",
       publicURI: "http://am3.example.com",
-      error: ""
+      error: "",
+      version: "0.15.0",
+      clusterMembers: ["am3"]
     }
   ];
   silenceFormStore = new SilenceFormStore();
@@ -139,7 +145,9 @@ describe("<AlertManagerInput />", () => {
     alertStore.data.upstreams.instances[0] = {
       name: "am1",
       publicURI: "http://am1.example.com/new",
-      error: ""
+      error: "",
+      version: "0.15.0",
+      clusterMembers: ["am1"]
     };
     // force update since this is where the mismatch check lives
     tree.instance().componentDidUpdate();
diff --git a/ui/src/Components/SilenceModal/SilenceSubmit/SilenceSubmitProgress.test.js b/ui/src/Components/SilenceModal/SilenceSubmit/SilenceSubmitProgress.test.js
index 1f95f320a..426673055 100644
--- a/ui/src/Components/SilenceModal/SilenceSubmit/SilenceSubmitProgress.test.js
+++ b/ui/src/Components/SilenceModal/SilenceSubmit/SilenceSubmitProgress.test.js
@@ -17,7 +17,9 @@ beforeEach(() => {
         name: "mockAlertmanager",
         uri: "file:///mock",
         publicURI: "http://example.com",
-        error: ""
+        error: "",
+        version: "0.15.0",
+        clusterMembers: ["mockAlertmanager"]
       }
     ]
   };
diff --git a/ui/src/Models/API.js b/ui/src/Models/API.js
index 3959c35f9..9f837e44f 100644
--- a/ui/src/Models/API.js
+++ b/ui/src/Models/API.js
@@ -68,7 +68,9 @@ const APIAlertmanagerUpstream = PropTypes.exact({
   name: PropTypes.string.isRequired,
   uri: PropTypes.string.isRequired,
   publicURI: PropTypes.string.isRequired,
-  error: PropTypes.string.isRequired
+  error: PropTypes.string.isRequired,
+  version: PropTypes.string.isRequired,
+  clusterMembers: PropTypes.arrayOf(PropTypes.string).isRequired
 });
 
 export {
diff --git a/ui/src/__mocks__/Alerts.js b/ui/src/__mocks__/Alerts.js
index ae8a012de..19e8c5077 100644
--- a/ui/src/__mocks__/Alerts.js
+++ b/ui/src/__mocks__/Alerts.js
@@ -68,7 +68,9 @@ const MockAlertmanager = () => ({
   name: "default",
   uri: "http://localhost",
   publicURI: "http://am.example.com",
-  error: ""
+  error: "",
+  version: "0.15.0",
+  clusterMembers: ["default"]
 });
 
 export {