Passing global state ccs

elastic · Oct 8, 2020 · 8856761 · 8856761
1 parent 4751894
commit 8856761
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/x-pack/plugins/monitoring/public/services/clusters.js b/x-pack/plugins/monitoring/public/services/clusters.js
@@ -69,9 +69,11 @@ export function monitoringClustersProvider($injector) {
       if (Legacy.shims.isCloud) {
         return Promise.resolve();
       }
-      const ccs = window.location.hash.split('?')[0] === '#/home' ? 'ccs' : 'single';
+      const globalState = $injector.get('globalState');
       return $http
-        .get(`../api/monitoring/v1/elasticsearch_settings/check/internal_monitoring/${ccs}`)
+        .post('../api/monitoring/v1/elasticsearch_settings/check/internal_monitoring', {
+          ccs: globalState.ccs,
+        })
         .then(({ data }) => {
           showInternalMonitoringToast({
             legacyIndices: data.legacy_indices,

diff --git a/...ugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts b/...ugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
@@ -72,11 +72,11 @@ export function internalMonitoringCheckRoute(
   server: { config: () => unknown },
   npRoute: RouteDependencies
 ) {
-  npRoute.router.get(
+  npRoute.router.post(
     {
-      path: '/api/monitoring/v1/elasticsearch_settings/check/internal_monitoring/{ccs}',
+      path: '/api/monitoring/v1/elasticsearch_settings/check/internal_monitoring',
       validate: {
-        params: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
         }),
       },
@@ -89,17 +89,10 @@ export function internalMonitoringCheckRoute(
         };
 
         const config = server.config();
-        const { ccs } = request.params;
-        const ccsPrefix = ccs === 'ccs' ? '*' : null;
-        const esIndexPattern = prefixIndexPattern(
-          config,
-          INDEX_PATTERN_ELASTICSEARCH,
-          ccsPrefix,
-          true
-        );
-        const kbnIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_KIBANA, ccsPrefix, true);
-        const lsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_LOGSTASH, ccsPrefix, true);
-
+        const { ccs } = request.body;
+        const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs, true);
+        const kbnIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_KIBANA, ccs, true);
+        const lsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_LOGSTASH, ccs, true);
         const indexCounts = await Promise.all([
           checkLatestMonitoringIsLegacy(context, esIndexPattern),
           checkLatestMonitoringIsLegacy(context, kbnIndexPattern),