Add latest changes from gitlab-org/gitlab@master

13 files changed, 71 insertions, 8 deletions

diff --git a/spec/fixtures/api/schemas/public_api/v4/snippets.json b/spec/fixtures/api/schemas/public_api/v4/snippets.json
index d13d703e063..ddddd46f5c4 100644
--- a/spec/fixtures/api/schemas/public_api/v4/snippets.json
+++ b/spec/fixtures/api/schemas/public_api/v4/snippets.json
@@ -10,6 +10,7 @@
       "description": { "type": ["string", "null"] },
       "visibility": { "type": "string" },
       "web_url": { "type": "string" },
+      "raw_url": { "type": "string" },
       "created_at": { "type": "date" },
       "updated_at": { "type": "date" },
       "author": {
@@ -27,7 +28,7 @@
     },
     "required": [
       "id", "title", "file_name", "description", "web_url",
-      "created_at", "updated_at", "author"
+      "created_at", "updated_at", "author", "raw_url"
     ],
     "additionalProperties": false
   }
diff --git a/spec/fixtures/lib/elasticsearch/query.json b/spec/fixtures/lib/elasticsearch/query.json
index 75164a7439f..86431bac572 100644
--- a/spec/fixtures/lib/elasticsearch/query.json
+++ b/spec/fixtures/lib/elasticsearch/query.json
@@ -26,7 +26,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_container.json b/spec/fixtures/lib/elasticsearch/query_with_container.json
index 11bc653441c..3cbe2e814b1 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_container.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_container.json
@@ -33,7 +33,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_cursor.json b/spec/fixtures/lib/elasticsearch/query_with_cursor.json
index c5b81e97d3c..da697b0b081 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_cursor.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_cursor.json
@@ -26,7 +26,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_end_time.json b/spec/fixtures/lib/elasticsearch/query_with_end_time.json
index 226e0f115e7..dca08382cd8 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_end_time.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_end_time.json
@@ -35,7 +35,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_filebeat_6.json b/spec/fixtures/lib/elasticsearch/query_with_filebeat_6.json
new file mode 100644
index 00000000000..75164a7439f
--- /dev/null
+++ b/spec/fixtures/lib/elasticsearch/query_with_filebeat_6.json
@@ -0,0 +1,40 @@
+{
+  "query": {
+    "bool": {
+      "must": [
+        {
+          "match_phrase": {
+            "kubernetes.pod.name": {
+              "query": "production-6866bc8974-m4sk4"
+            }
+          }
+        },
+        {
+          "match_phrase": {
+            "kubernetes.namespace": {
+              "query": "autodevops-deploy-9-production"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "sort": [
+    {
+      "@timestamp": {
+        "order": "desc"
+      }
+    },
+    {
+      "offset": {
+        "order": "desc"
+      }
+    }
+  ],
+  "_source": [
+    "@timestamp",
+    "message",
+    "kubernetes.pod.name"
+  ],
+  "size": 500
+}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_search.json b/spec/fixtures/lib/elasticsearch/query_with_search.json
index ca63c12f3b8..ab5c0ef13c2 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_search.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_search.json
@@ -35,7 +35,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_start_time.json b/spec/fixtures/lib/elasticsearch/query_with_start_time.json
index cb3e37de8a7..479e4b74cdf 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_start_time.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_start_time.json
@@ -35,7 +35,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/elasticsearch/query_with_times.json b/spec/fixtures/lib/elasticsearch/query_with_times.json
index 91d28b28842..8bb0109a053 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_times.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_times.json
@@ -36,7 +36,7 @@
       }
     },
     {
-      "offset": {
+      "log.offset": {
         "order": "desc"
       }
     }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/development_metrics.yml b/spec/fixtures/lib/gitlab/metrics/dashboard/development_metrics.yml
new file mode 100644
index 00000000000..2a4de35c1ec
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/development_metrics.yml
@@ -0,0 +1,20 @@
+panel_groups:
+  - group: 'Usage Variation'
+    panels:
+      - type: anomaly-chart
+        title: "Memory Usage Rate Anomalies"
+        y_label: "Memory Usage Rate"
+        metrics:
+          - id: container_memory_usage_bytes
+            query_range: avg(sum(rate(container_memory_usage_bytes[15m]))) /1024
+            label: "Memory Usage Rate"
+            unit: "kB"
+          - id: container_memory_usage_bytes_upper
+            query_range: 80000
+            label: "Memory Usage Rate Lower Limit"
+            unit: "kB"
+          - id: container_memory_usage_bytes_lower
+            query_range: 50000
+            label: "Memory Usage Rate Upper Limit"
+            unit: "kB"
+
diff --git a/spec/fixtures/terraform/tfplan.json b/spec/fixtures/terraform/tfplan.json
new file mode 100644
index 00000000000..0ab4891e63a
--- /dev/null
+++ b/spec/fixtures/terraform/tfplan.json
@@ -0,0 +1 @@
+{"create": 0, "update": 1, "delete": 0}
diff --git a/spec/fixtures/terraform/tfplan_with_corrupted_data.json b/spec/fixtures/terraform/tfplan_with_corrupted_data.json
new file mode 100644
index 00000000000..b83f5e172bb
--- /dev/null
+++ b/spec/fixtures/terraform/tfplan_with_corrupted_data.json
@@ -0,0 +1 @@
+Exited code 1
diff --git a/spec/fixtures/x509/ZZZZZZA6.crl b/spec/fixtures/x509/ZZZZZZA6.crl
new file mode 100644
index 00000000000..eb6b9d5d71a
--- /dev/null
+++ b/spec/fixtures/x509/ZZZZZZA6.crl