Merge branch 'main' into friendlier-publicBaseUrl-warning

elastic · Feb 23, 2022 · 1404742 · 1404742
2 parents 5b89676 + bc35610
commit 1404742
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/.buildkite/scripts/steps/cloud/build_and_deploy.sh b/.buildkite/scripts/steps/cloud/build_and_deploy.sh
@@ -53,6 +53,13 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
   CLOUD_DEPLOYMENT_ID=$(jq -r --slurp '.[0].id' "$JSON_FILE")
   CLOUD_DEPLOYMENT_STATUS_MESSAGES=$(jq --slurp '[.[]|select(.resources == null)]' "$JSON_FILE")
 
+  # Enable stack monitoring
+  jq '
+    .settings.observability.metrics.destination.deployment_id = "'$CLOUD_DEPLOYMENT_ID'" |
+    .settings.observability.logging.destination.deployment_id = "'$CLOUD_DEPLOYMENT_ID'"
+    ' .buildkite/scripts/steps/cloud/stack_monitoring.json > /tmp/stack_monitoring.json
+  ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/stack_monitoring.json &> "$JSON_FILE"
+
   # Refresh vault token
   VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
   VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"

diff --git a/.buildkite/scripts/steps/cloud/stack_monitoring.json b/.buildkite/scripts/steps/cloud/stack_monitoring.json
@@ -0,0 +1,19 @@
+{
+  "prune_orphans": false,
+  "settings": {
+    "observability": {
+      "metrics": {
+        "destination": {
+          "deployment_id": null,
+          "ref_id": "main-elasticsearch"
+        }
+      },
+      "logging": {
+        "destination": {
+          "deployment_id": null,
+          "ref_id": "main-elasticsearch"
+        }
+      }
+    }
+  }
+}
diff --git a/...ublic/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap b/...ublic/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
@@ -106,18 +106,18 @@ export class UpdateSourceEditor extends Component<Props, State> {
   };
 
   _getMetricsFilter() {
-    if (this.props.currentLayerType === LAYER_TYPE.HEATMAP) {
-      return (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
-        // these are countable metrics, where blending heatmap color blobs make sense
-        return metric.value ? isMetricCountable(metric.value) : false;
-      };
-    }
-
-    if (this.props.resolution === GRID_RESOLUTION.SUPER_FINE) {
-      return (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
-        return metric.value !== AGG_TYPE.TERMS;
-      };
-    }
+    return this.props.currentLayerType === LAYER_TYPE.HEATMAP
+      ? (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
+          // these are countable metrics, where blending heatmap color blobs make sense
+          return metric.value ? isMetricCountable(metric.value) : false;
+        }
+      : (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
+          // terms aggregation is not supported with Elasticsearch _mvt endpoint
+          // The goal is to remove GeoJSON ESGeoGridSource implemenation and only have MVT ESGeoGridSource implemenation
+          // First step is to deprecate terms aggregation for ESGeoGridSource
+          // and prevent new uses of terms aggregation for ESGeoGridSource
+          return metric.value !== AGG_TYPE.TERMS;
+        };
   }
 
   _renderMetricsPanel() {