Merge pull request #343 from cloudfoundry-community/v7

V7
cloudfoundry-community · Feb 26, 2020 · 1eab922 · 1eab922
2 parents 214116c + ab1b6f2
commit 1eab922
Show file tree

Hide file tree

Showing 55 changed files with 1,302 additions and 735 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,7 +1,7 @@
-cf-kibana/kibana-6.8.1-linux-x86_64.tar.gz:
-  size: 186486884
-  object_id: 5fc2ccc4-0130-4d79-614d-369630619bf2
-  sha: sha256:45cc8c47286f218abbdab04ec502b5de99c86e3da2e8debadaeb99ac79391e02
+cf-kibana/kibana-7.6.0-linux-x86_64.tar.gz:
+  size: 249467327
+  object_id: 8c2e3050-1d4f-4ded-7f4b-031fb382ec03
+  sha: sha256:3dafefee001da4fe20f8ecf31df59f485c48aabe6814d30089ed253e030a599d
 redis/redis-3.2.9.tar.gz:
   size: 1547695
   object_id: a1230536-4203-40b9-97e1-9f11d470308d

diff --git a/jobs/upload-kibana-objects/spec b/jobs/upload-kibana-objects/spec
@@ -26,11 +26,6 @@ templates:
   kibana-objects/index-pattern/logs.json.erb:           kibana-objects/index-pattern/logs-*.json
   kibana-objects/index-pattern/logs-platform.json.erb:  kibana-objects/index-pattern/logs-platform*.json
 
-  kibana-objects/config/4.4.0.json.erb:  kibana-objects/config/4.4.0.json
-  kibana-objects/config/4.4.2.json.erb:  kibana-objects/config/4.4.2.json
-  kibana-objects/config/4.5.4.json.erb:  kibana-objects/config/4.5.4.json
-  kibana-objects/config/6.3.2.json.erb:  kibana-objects/config/6.3.2.json
-
   kibana-objects/search/app-all.json.erb:                         kibana-objects/search/app-all.json
   kibana-objects/search/app-all-messages.json.erb:                kibana-objects/search/app-all-messages.json
   kibana-objects/search/app-all-errors.json.erb:                  kibana-objects/search/app-all-errors.json
@@ -104,7 +99,6 @@ properties:
     description: "List of glob patterns of Kibana objects to upload"
     default:
     - {type: index-pattern, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/index-pattern/*.json}
-    - {type: config, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/config/*.json}
     - {type: search, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/search/*.json}
     - {type: visualization, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/visualization/*.json}
     - {type: dashboard, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/dashboard/*.json}

diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb
@@ -6,63 +6,69 @@
     "hits": 0,
     "description": "",
     "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' }
-      [
-        {
-          "id": "App-errors-count-in-timeline-(top-5-apps)",
-          "type": "visualization",
-          "panelIndex": 1,
-          "size_x": 9,
-          "size_y": 6,
-          "col": 1,
-          "row": 1
-        },
-        {
-          "col": 10,
-          "id": "App-apps-with-errors",
-          "panelIndex": 2,
-          "row": 1,
-          "size_x": 3,
-          "size_y": 6,
-          "type": "visualization"
-        },
-        {
-          "col": 1,
-          "columns": [
-            "@level",
-            "@source.job",
-            "@cf.app",
-            "@message"
-          ],
-          "id": "app-all-errors",
-          "panelIndex": 3,
-          "row": 7,
-          "size_x": 12,
-          "size_y": 5,
-          "sort": [
-            "@timestamp",
-            "desc"
-          ],
-          "type": "search"
-        }
-      ]
-ENDOFFJSON
-  %>",
-    "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' }
+    [
       {
-        "P-1": {
+        "panelIndex": "1",
+        "panelRefName": "panel_0",
+        "version": "7.3.0",
+        "gridData": {
+          "x": 0,
+          "y": 0,
+          "w": 36,
+          "h": 24,
+          "i": "1"
+        },
+        "embeddableConfig": {
           "vis": {
             "legendOpen": true
           }
+        }
+      },
+      {
+        "panelIndex": "2",
+        "panelRefName": "panel_1",
+        "version": "7.3.0",
+        "gridData": {
+          "x": 36,
+          "y": 0,
+          "w": 12,
+          "h": 24,
+          "i": "2"
         },
-        "P-2": {
+        "embeddableConfig": {
           "spy": {
             "mode": {
               "name": null,
               "fill": false
             }
           }
         }
+      },
+      {
+        "panelIndex": "3",
+        "panelRefName": "panel_2",
+        "version": "7.3.0",
+        "gridData": {
+          "x": 0,
+          "y": 24,
+          "w": 48,
+          "h": 20,
+          "i": "3"
+        },
+        "embeddableConfig": {
+          "columns": [
+            "@level",
+            "@source.job",
+            "@cf.app",
+            "@message"
+          ],
+          "sort": [
+            "@timestamp",
+            "desc"
+          ]
+        }
       }
+      ]
 ENDOFFJSON
   %>",
     "optionsJSON": "{\"darkTheme\":false}",
@@ -85,6 +91,23 @@ ENDOFFJSON
 ENDOFFJSON
   %>"
     }
-  }
+  },
+  "references": [
+    {
+      "id": "App-errors-count-in-timeline-(top-5-apps)",
+      "name": "panel_0",
+      "type": "visualization"
+    },
+    {
+      "id": "App-apps-with-errors",
+      "name": "panel_1",
+      "type": "visualization"
+    },
+    {
+      "id": "app-all-errors",
+      "name": "panel_2",
+      "type": "search"
+    }
+  ]
 }
 <% end %>
diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb
@@ -8,39 +8,45 @@
     "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' }
       [
         {
-          "id": "App-RTR-requests-map",
-          "type": "visualization",
-          "panelIndex": 1,
-          "size_x": 9,
-          "size_y": 8,
-          "col": 1,
-          "row": 1
+          "panelIndex": "1",
+          "panelRefName": "panel_0",
+          "version": "7.3.0",
+          "gridData": {
+            "x": 0,
+            "y": 0,
+            "w": 36,
+            "h": 32,
+            "i": "1"
+          },
+          "embeddableConfig": {}
         },
         {
-          "id": "App-names",
-          "type": "visualization",
-          "panelIndex": 2,
-          "size_x": 3,
-          "size_y": 5,
-          "col": 10,
-          "row": 1
+          "panelIndex": "2",
+          "panelRefName": "panel_1",
+          "version": "7.3.0",
+          "gridData": {
+            "x": 36,
+            "y": 0,
+            "w": 12,
+            "h": 20,
+            "i": "2"
+          },
+          "embeddableConfig": {}
         },
         {
-          "id": "App-RTR-request-count-by-timezone-(top-5)",
-          "type": "visualization",
-          "panelIndex": 3,
-          "size_x": 3,
-          "size_y": 3,
-          "col": 10,
-          "row": 6
+          "panelIndex": "3",
+          "panelRefName": "panel_2",
+          "version": "7.3.0",
+          "gridData": {
+            "x": 36,
+            "y": 20,
+            "w": 12,
+            "h": 12,
+            "i": "3"
+          },
+          "embeddableConfig": {}
         }
       ]
-ENDOFFJSON
-  %>",
-    "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' }
-      {
-
-      }
 ENDOFFJSON
   %>",
     "optionsJSON": "{\"darkTheme\":false}",
@@ -63,6 +69,23 @@ ENDOFFJSON
 ENDOFFJSON
   %>"
     }
-  }
+  },
+  "references": [
+    {
+      "id": "App-RTR-requests-map",
+      "name": "panel_0",
+      "type": "visualization"
+    },
+    {
+      "id": "App-names",
+      "name": "panel_1",
+      "type": "visualization"
+    },
+    {
+      "id": "App-RTR-request-count-by-timezone-(top-5)",
+      "name": "panel_2",
+      "type": "visualization"
+    }
+  ]
 }
 <% end %>