Add latest changes from gitlab-org/gitlab@12-10-stable-ee

3 files changed, 106 insertions, 0 deletions

diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index ba97b7c82cb..ce62655648b 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -39,6 +39,9 @@
         "stack": { "type": ["string", "null"] },
         "modsecurity_enabled": { "type": ["boolean", "null"] },
         "modsecurity_mode": {"type": ["integer", "0"]},
+        "host": {"type": ["string", "null"]},
+        "port": {"type": ["integer", "514"]},
+        "protocol": {"type": ["integer", "0"]},
         "update_available": { "type": ["boolean", "null"] },
         "can_uninstall": { "type": "boolean" },
         "available_domains": {
diff --git a/spec/fixtures/lib/elasticsearch/pods_query.json b/spec/fixtures/lib/elasticsearch/pods_query.json
new file mode 100644
index 00000000000..90d162b871a
--- /dev/null
+++ b/spec/fixtures/lib/elasticsearch/pods_query.json
@@ -0,0 +1,28 @@
+{
+  "aggs": {
+    "pods": {
+      "aggs": {
+        "containers": {
+          "terms": {
+            "field": "kubernetes.container.name",
+            "size": 500
+          }
+        }
+      },
+      "terms": {
+        "field": "kubernetes.pod.name",
+        "size": 500
+      }
+    }
+  },
+  "query": {
+    "bool": {
+      "must": {
+        "match_phrase": {
+          "kubernetes.namespace": "autodevops-deploy-9-production"
+        }
+      }
+    }
+  },
+  "size": 0
+}
diff --git a/spec/fixtures/lib/elasticsearch/pods_response.json b/spec/fixtures/lib/elasticsearch/pods_response.json
new file mode 100644
index 00000000000..d923f914d7c
--- /dev/null
+++ b/spec/fixtures/lib/elasticsearch/pods_response.json
@@ -0,0 +1,75 @@
+{
+  "took": 8540,
+  "timed_out": false,
+  "_shards": {
+    "total": 153,
+    "successful": 153,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": 62143,
+    "max_score": 0.0,
+    "hits": [
+
+    ]
+  },
+  "aggregations": {
+    "pods": {
+      "doc_count_error_upper_bound": 0,
+      "sum_other_doc_count": 0,
+      "buckets": [
+        {
+          "key": "runner-gitlab-runner-7bbfb5dcb5-p6smb",
+          "doc_count": 19795,
+          "containers": {
+            "doc_count_error_upper_bound": 0,
+            "sum_other_doc_count": 0,
+            "buckets": [
+              {
+                "key": "runner-gitlab-runner",
+                "doc_count": 19795
+              }
+            ]
+          }
+        },
+        {
+          "key": "elastic-stack-elasticsearch-master-1",
+          "doc_count": 13185,
+          "containers": {
+            "doc_count_error_upper_bound": 0,
+            "sum_other_doc_count": 0,
+            "buckets": [
+              {
+                "key": "elasticsearch",
+                "doc_count": 13158
+              },
+              {
+                "key": "chown",
+                "doc_count": 24
+              },
+              {
+                "key": "sysctl",
+                "doc_count": 3
+              }
+            ]
+          }
+        },
+        {
+          "key": "ingress-nginx-ingress-controller-76449bcc8d-8qgl6",
+          "doc_count": 3437,
+          "containers": {
+            "doc_count_error_upper_bound": 0,
+            "sum_other_doc_count": 0,
+            "buckets": [
+              {
+                "key": "nginx-ingress-controller",
+                "doc_count": 3437
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}