summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 03:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 03:09:43 +0000
commitb4b9b3854eddd2a4829113ebfc1812c3a332a7d9 (patch)
tree6a21e491917e1606d81329af710459b0217eb1a4 /spec/fixtures
parent2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (diff)
downloadgitlab-ce-b4b9b3854eddd2a4829113ebfc1812c3a332a7d9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/lib/elasticsearch/logs_response.json28
-rw-r--r--spec/fixtures/lib/elasticsearch/query.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_container.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_cursor.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_end_time.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_search.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_start_time.json3
-rw-r--r--spec/fixtures/lib/elasticsearch/query_with_times.json3
8 files changed, 38 insertions, 11 deletions
diff --git a/spec/fixtures/lib/elasticsearch/logs_response.json b/spec/fixtures/lib/elasticsearch/logs_response.json
index 7a733882089..2dbc6f569a5 100644
--- a/spec/fixtures/lib/elasticsearch/logs_response.json
+++ b/spec/fixtures/lib/elasticsearch/logs_response.json
@@ -19,7 +19,12 @@
"_score": null,
"_source": {
"message": "10.8.2.1 - - [25/Oct/2019:08:03:22 UTC] \"GET / HTTP/1.1\" 200 13",
- "@timestamp": "2019-12-13T14:35:34.034Z"
+ "@timestamp": "2019-12-13T14:35:34.034Z",
+ "kubernetes": {
+ "pod": {
+ "name": "production-6866bc8974-m4sk4"
+ }
+ }
},
"sort": [
9999998,
@@ -33,7 +38,12 @@
"_score": null,
"_source": {
"message": "10.8.2.1 - - [27/Oct/2019:23:49:54 UTC] \"GET / HTTP/1.1\" 200 13",
- "@timestamp": "2019-12-13T14:35:35.034Z"
+ "@timestamp": "2019-12-13T14:35:35.034Z",
+ "kubernetes": {
+ "pod": {
+ "name": "production-6866bc8974-m4sk4"
+ }
+ }
},
"sort": [
9999949,
@@ -47,7 +57,12 @@
"_score": null,
"_source": {
"message": "10.8.2.1 - - [04/Nov/2019:23:09:24 UTC] \"GET / HTTP/1.1\" 200 13",
- "@timestamp": "2019-12-13T14:35:36.034Z"
+ "@timestamp": "2019-12-13T14:35:36.034Z",
+ "kubernetes": {
+ "pod": {
+ "name": "production-6866bc8974-m4sk4"
+ }
+ }
},
"sort": [
9999944,
@@ -61,7 +76,12 @@
"_score": null,
"_source": {
"message": "- -\u003e /",
- "@timestamp": "2019-12-13T14:35:37.034Z"
+ "@timestamp": "2019-12-13T14:35:37.034Z",
+ "kubernetes": {
+ "pod": {
+ "name": "production-6866bc8974-m4sk4"
+ }
+ }
},
"sort": [
9999934,
diff --git a/spec/fixtures/lib/elasticsearch/query.json b/spec/fixtures/lib/elasticsearch/query.json
index 565c871b1c7..75164a7439f 100644
--- a/spec/fixtures/lib/elasticsearch/query.json
+++ b/spec/fixtures/lib/elasticsearch/query.json
@@ -33,7 +33,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_container.json b/spec/fixtures/lib/elasticsearch/query_with_container.json
index 21eac5d7dbe..11bc653441c 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_container.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_container.json
@@ -40,7 +40,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_cursor.json b/spec/fixtures/lib/elasticsearch/query_with_cursor.json
index 1264fdb0322..c5b81e97d3c 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_cursor.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_cursor.json
@@ -37,7 +37,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_end_time.json b/spec/fixtures/lib/elasticsearch/query_with_end_time.json
index 2859e6427d4..226e0f115e7 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_end_time.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_end_time.json
@@ -42,7 +42,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "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 3c9bed047fa..ca63c12f3b8 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_search.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_search.json
@@ -42,7 +42,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_start_time.json b/spec/fixtures/lib/elasticsearch/query_with_start_time.json
index 0c5cfca42f7..cb3e37de8a7 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_start_time.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_start_time.json
@@ -42,7 +42,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}
diff --git a/spec/fixtures/lib/elasticsearch/query_with_times.json b/spec/fixtures/lib/elasticsearch/query_with_times.json
index 7108d42217e..91d28b28842 100644
--- a/spec/fixtures/lib/elasticsearch/query_with_times.json
+++ b/spec/fixtures/lib/elasticsearch/query_with_times.json
@@ -43,7 +43,8 @@
],
"_source": [
"@timestamp",
- "message"
+ "message",
+ "kubernetes.pod.name"
],
"size": 500
}