Fixing make and removing custom index patterns

elastic · Jul 6, 2020 · 4cd639c · 4cd639c
1 parent 4cde20f
commit 4cd639c
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 67 deletions.
diff --git a/dashboards/endpoint_dashboard.ndjson b/dashboards/endpoint_dashboard.ndjson
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,9 +3,9 @@
 version: "3.8"
 services:
   package-registry:
-    image: docker.elastic.co/package-registry/package-registry:master
+    image: docker.elastic.co/package-registry/distribution:production
     volumes:
-      - ./package-registry.config.yml:/registry/config.yml
-      - ./out/packages:/registry/packages/endpoint-package
+      - ./package-registry.config.yml:/package-registry/config.yml
+      - ./out/packages:/packages/endpoint-package
     ports:
       - "127.0.0.1:8080:8080"
diff --git a/package-registry.config.yml b/package-registry.config.yml
@@ -1,4 +1,4 @@
 package_paths:
-  - /registry/packages/package-storage
-  - /registry/packages/endpoint-package
+  - /packages/production
+  - /packages/endpoint-package
 dev_mode: true
diff --git a/package/endpoint/docs/README.md b/package/endpoint/docs/README.md
@@ -1,3 +1,3 @@
-# Endpoint package
+# Elastic Endpoint Security Integration
 
-This is a module for the Endpoint Kibana App and Elastic Endpoint. It sets up the templates, index patterns, aliases, and dashboards.
+This is a module for the Elastic Security Solution Kibana App and Elastic Endpoint. It sets up the templates, index patterns, aliases, and dashboards.
diff --git a/package/endpoint/kibana/dashboard/826759f0-7074-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/dashboard/826759f0-7074-11ea-9bc8-6b38f4d29a16.json
@@ -3,10 +3,10 @@
         "description": "",
         "hits": 0,
         "kibanaSavedObjectMeta": {
-            "searchSourceJSON": "{\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[{\"meta\":{\"alias\":\"Endpoint Data Filter\",\"negate\":false,\"disabled\":false,\"type\":\"phrase\",\"key\":\"agent.type\",\"params\":{\"query\":\"endpoint\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"agent.type\":\"endpoint\"}},\"$state\":{\"store\":\"appState\"}}]}"
+            "searchSourceJSON": "{\n  \"query\": {\n    \"language\": \"kuery\",\n    \"query\": \"\"\n  },\n  \"filter\": [\n    {\n      \"meta\": {\n        \"alias\": \"Endpoint Data Filter\",\n        \"negate\": false,\n        \"disabled\": false,\n        \"type\": \"phrase\",\n        \"key\": \"agent.type\",\n        \"params\": {\n          \"query\": \"endpoint\"\n        },\n        \"indexRefName\": \"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"\n      },\n      \"query\": {\n        \"match_phrase\": {\n          \"agent.type\": \"endpoint\"\n        }\n      },\n      \"$state\": {\n        \"store\": \"appState\"\n      }\n    }\n  ]\n}"
         },
-        "optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
-        "panelsJSON": "[{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":7,\"i\":\"c923502a-9a0e-47bb-8d1b-e642b399c8e3\"},\"panelIndex\":\"c923502a-9a0e-47bb-8d1b-e642b399c8e3\",\"embeddableConfig\":{\"title\":\"Controls\"},\"title\":\"Controls\",\"panelRefName\":\"panel_0\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":7,\"w\":48,\"h\":9,\"i\":\"fdbb5d05-207d-48d7-aa03-df16adda707f\"},\"panelIndex\":\"fdbb5d05-207d-48d7-aa03-df16adda707f\",\"embeddableConfig\":{\"title\":\"Alerts over Time\"},\"title\":\"Alerts over Time\",\"panelRefName\":\"panel_1\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":16,\"w\":24,\"h\":9,\"i\":\"e1b2e433-9c26-4c76-b0da-43397876a8fc\"},\"panelIndex\":\"e1b2e433-9c26-4c76-b0da-43397876a8fc\",\"embeddableConfig\":{\"title\":\"\"},\"panelRefName\":\"panel_2\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":24,\"y\":16,\"w\":24,\"h\":9,\"i\":\"9882f4a7-e675-4f33-9eed-41dfc7b3f88b\"},\"panelIndex\":\"9882f4a7-e675-4f33-9eed-41dfc7b3f88b\",\"embeddableConfig\":{\"title\":\"\"},\"panelRefName\":\"panel_3\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":25,\"w\":24,\"h\":15,\"i\":\"1da940b4-edcc-469e-81dc-d6d83efb1ea1\"},\"panelIndex\":\"1da940b4-edcc-469e-81dc-d6d83efb1ea1\",\"embeddableConfig\":{\"title\":\"Top Two Endpoints by CPU Usage\"},\"title\":\"Top Two Endpoints by CPU Usage\",\"panelRefName\":\"panel_4\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":24,\"y\":25,\"w\":24,\"h\":15,\"i\":\"d142d5e6-4296-4315-8790-6266e6c48b54\"},\"panelIndex\":\"d142d5e6-4296-4315-8790-6266e6c48b54\",\"embeddableConfig\":{\"title\":\"Top Two Endpoints by Memory Usage\"},\"title\":\"Top Two Endpoints by Memory Usage\",\"panelRefName\":\"panel_5\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":40,\"w\":48,\"h\":10,\"i\":\"2b6b6a19-3870-4127-bccf-c81c51e10544\"},\"panelIndex\":\"2b6b6a19-3870-4127-bccf-c81c51e10544\",\"embeddableConfig\":{\"title\":\"Event Count by Hostname\"},\"title\":\"Event Count by Hostname\",\"panelRefName\":\"panel_6\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":0,\"y\":50,\"w\":24,\"h\":15,\"i\":\"996c9423-7803-49e0-92d8-4ccfde71b425\"},\"panelIndex\":\"996c9423-7803-49e0-92d8-4ccfde71b425\",\"embeddableConfig\":{\"title\":\"Endpoint Count by Operating System\"},\"title\":\"Endpoint Count by Operating System\",\"panelRefName\":\"panel_7\"},{\"version\":\"7.9.0\",\"gridData\":{\"x\":24,\"y\":50,\"w\":24,\"h\":15,\"i\":\"e16e025f-20c4-4075-8342-76820c2ff4c7\"},\"panelIndex\":\"e16e025f-20c4-4075-8342-76820c2ff4c7\",\"embeddableConfig\":{\"title\":\"Event Count by Category\"},\"title\":\"Event Count by Category\",\"panelRefName\":\"panel_8\"}]",
+        "optionsJSON": "{\n  \"hidePanelTitles\": false,\n  \"useMargins\": true\n}",
+        "panelsJSON": "[\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 0,\n      \"w\": 48,\n      \"h\": 7,\n      \"i\": \"c923502a-9a0e-47bb-8d1b-e642b399c8e3\"\n    },\n    \"panelIndex\": \"c923502a-9a0e-47bb-8d1b-e642b399c8e3\",\n    \"embeddableConfig\": {\n      \"title\": \"Controls\"\n    },\n    \"title\": \"Controls\",\n    \"panelRefName\": \"panel_0\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 7,\n      \"w\": 48,\n      \"h\": 9,\n      \"i\": \"fdbb5d05-207d-48d7-aa03-df16adda707f\"\n    },\n    \"panelIndex\": \"fdbb5d05-207d-48d7-aa03-df16adda707f\",\n    \"embeddableConfig\": {\n      \"title\": \"Alerts over Time\"\n    },\n    \"title\": \"Alerts over Time\",\n    \"panelRefName\": \"panel_1\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 16,\n      \"w\": 24,\n      \"h\": 9,\n      \"i\": \"e1b2e433-9c26-4c76-b0da-43397876a8fc\"\n    },\n    \"panelIndex\": \"e1b2e433-9c26-4c76-b0da-43397876a8fc\",\n    \"embeddableConfig\": {\n      \"title\": \"\"\n    },\n    \"panelRefName\": \"panel_2\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 24,\n      \"y\": 16,\n      \"w\": 24,\n      \"h\": 9,\n      \"i\": \"9882f4a7-e675-4f33-9eed-41dfc7b3f88b\"\n    },\n    \"panelIndex\": \"9882f4a7-e675-4f33-9eed-41dfc7b3f88b\",\n    \"embeddableConfig\": {\n      \"title\": \"\"\n    },\n    \"panelRefName\": \"panel_3\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 25,\n      \"w\": 24,\n      \"h\": 15,\n      \"i\": \"1da940b4-edcc-469e-81dc-d6d83efb1ea1\"\n    },\n    \"panelIndex\": \"1da940b4-edcc-469e-81dc-d6d83efb1ea1\",\n    \"embeddableConfig\": {\n      \"title\": \"Top Two Endpoints by CPU Usage\"\n    },\n    \"title\": \"Top Two Endpoints by CPU Usage\",\n    \"panelRefName\": \"panel_4\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 24,\n      \"y\": 25,\n      \"w\": 24,\n      \"h\": 15,\n      \"i\": \"d142d5e6-4296-4315-8790-6266e6c48b54\"\n    },\n    \"panelIndex\": \"d142d5e6-4296-4315-8790-6266e6c48b54\",\n    \"embeddableConfig\": {\n      \"title\": \"Top Two Endpoints by Memory Usage\"\n    },\n    \"title\": \"Top Two Endpoints by Memory Usage\",\n    \"panelRefName\": \"panel_5\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 40,\n      \"w\": 48,\n      \"h\": 10,\n      \"i\": \"2b6b6a19-3870-4127-bccf-c81c51e10544\"\n    },\n    \"panelIndex\": \"2b6b6a19-3870-4127-bccf-c81c51e10544\",\n    \"embeddableConfig\": {\n      \"title\": \"Event Count by Hostname\"\n    },\n    \"title\": \"Event Count by Hostname\",\n    \"panelRefName\": \"panel_6\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 0,\n      \"y\": 50,\n      \"w\": 24,\n      \"h\": 15,\n      \"i\": \"996c9423-7803-49e0-92d8-4ccfde71b425\"\n    },\n    \"panelIndex\": \"996c9423-7803-49e0-92d8-4ccfde71b425\",\n    \"embeddableConfig\": {\n      \"title\": \"Endpoint Count by Operating System\"\n    },\n    \"title\": \"Endpoint Count by Operating System\",\n    \"panelRefName\": \"panel_7\"\n  },\n  {\n    \"version\": \"7.9.0\",\n    \"gridData\": {\n      \"x\": 24,\n      \"y\": 50,\n      \"w\": 24,\n      \"h\": 15,\n      \"i\": \"e16e025f-20c4-4075-8342-76820c2ff4c7\"\n    },\n    \"panelIndex\": \"e16e025f-20c4-4075-8342-76820c2ff4c7\",\n    \"embeddableConfig\": {\n      \"title\": \"Event Count by Category\"\n    },\n    \"title\": \"Event Count by Category\",\n    \"panelRefName\": \"panel_8\"\n  }\n]",
         "timeRestore": false,
         "title": "Endpoint Dashboard",
         "version": 1
@@ -17,7 +17,7 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-logs",
+            "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
         },
@@ -68,6 +68,6 @@
         }
     ],
     "type": "dashboard",
-    "updated_at": "2020-07-02T22:31:08.392Z",
-    "version": "WzI5MCwxXQ=="
+    "updated_at": "2020-07-06T20:35:39.670Z",
+    "version": "Wzk5LDFd"
 }
diff --git a/package/endpoint/kibana/index-pattern/endpoint-dashboard-logs.json b/package/endpoint/kibana/index-pattern/endpoint-dashboard-logs.json
diff --git a/...x-pattern/endpoint-dashboard-metrics.json → ...x_pattern/endpoint-dashboard-metrics.json b/...x-pattern/endpoint-dashboard-metrics.json → ...x_pattern/endpoint-dashboard-metrics.json
diff --git a/package/endpoint/kibana/visualization/1a8b30f0-8a5e-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/1a8b30f0-8a5e-11ea-9bc8-6b38f4d29a16.json
@@ -15,6 +15,6 @@
     },
     "references": [],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:06:13.793Z",
-    "version": "WzIyOCwxXQ=="
+    "updated_at": "2020-07-06T20:34:32.280Z",
+    "version": "WzgwLDFd"
 }
diff --git a/package/endpoint/kibana/visualization/1cfceda0-728b-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/1cfceda0-728b-11ea-9bc8-6b38f4d29a16.json
@@ -15,17 +15,17 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-logs",
+            "id": "logs-*",
             "name": "control_0_index_pattern",
             "type": "index-pattern"
         },
         {
-            "id": "endpoint-dashboard-logs",
+            "id": "logs-*",
             "name": "control_1_index_pattern",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:16:19.746Z",
-    "version": "WzI0OSwxXQ=="
+    "updated_at": "2020-07-06T20:36:17.446Z",
+    "version": "WzEwMSwxXQ=="
 }
diff --git a/package/endpoint/kibana/visualization/1e525190-7074-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/1e525190-7074-11ea-9bc8-6b38f4d29a16.json
@@ -15,12 +15,12 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-logs",
+            "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:06:37.838Z",
-    "version": "WzIzMCwxXQ=="
+    "updated_at": "2020-07-06T20:36:31.397Z",
+    "version": "WzEwMiwxXQ=="
 }
diff --git a/package/endpoint/kibana/visualization/2ed8a5b0-895f-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/2ed8a5b0-895f-11ea-9bc8-6b38f4d29a16.json
@@ -15,12 +15,12 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-metrics",
+            "id": "metrics-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:22:41.425Z",
-    "version": "WzI3MSwxXQ=="
+    "updated_at": "2020-07-06T20:36:45.659Z",
+    "version": "WzEwMywxXQ=="
 }
diff --git a/package/endpoint/kibana/visualization/3560af80-8a5a-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/3560af80-8a5a-11ea-9bc8-6b38f4d29a16.json
@@ -15,6 +15,6 @@
     },
     "references": [],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:04:10.603Z",
-    "version": "WzIyNSwxXQ=="
+    "updated_at": "2020-07-06T20:34:32.280Z",
+    "version": "Wzg1LDFd"
 }
diff --git a/package/endpoint/kibana/visualization/3aecae50-8a5e-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/3aecae50-8a5e-11ea-9bc8-6b38f4d29a16.json
@@ -15,6 +15,6 @@
     },
     "references": [],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:05:41.636Z",
-    "version": "WzIyNywxXQ=="
+    "updated_at": "2020-07-06T20:34:32.280Z",
+    "version": "Wzg2LDFd"
 }
diff --git a/package/endpoint/kibana/visualization/3e8ccf70-8961-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/3e8ccf70-8961-11ea-9bc8-6b38f4d29a16.json
@@ -15,12 +15,12 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-metrics",
+            "id": "metrics-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:23:03.359Z",
-    "version": "WzI3MiwxXQ=="
+    "updated_at": "2020-07-06T20:37:02.577Z",
+    "version": "WzEwOSwxXQ=="
 }
diff --git a/package/endpoint/kibana/visualization/55387750-729c-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/55387750-729c-11ea-9bc8-6b38f4d29a16.json
@@ -15,12 +15,12 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-logs",
+            "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T21:58:07.354Z",
-    "version": "WzIwOCwxXQ=="
+    "updated_at": "2020-07-06T20:37:15.738Z",
+    "version": "WzExMCwxXQ=="
 }
diff --git a/package/endpoint/kibana/visualization/92b1edc0-706a-11ea-9bc8-6b38f4d29a16.json b/package/endpoint/kibana/visualization/92b1edc0-706a-11ea-9bc8-6b38f4d29a16.json
@@ -15,12 +15,12 @@
     },
     "references": [
         {
-            "id": "endpoint-dashboard-metrics",
+            "id": "metrics-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
         }
     ],
     "type": "visualization",
-    "updated_at": "2020-07-02T22:14:27.812Z",
-    "version": "WzI0NiwxXQ=="
+    "updated_at": "2020-07-06T20:37:31.497Z",
+    "version": "WzExMSwxXQ=="
 }
diff --git a/package/endpoint/manifest.yml b/package/endpoint/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: endpoint
 title: Elastic Endpoint
-description: This is the Elastic Endpoint package.
+description: Elastic Endpoint Security Integration
 version: 0.9.0
 categories: ["security"]
 # Options are experimental, beta, ga
@@ -13,7 +13,7 @@ license: basic
 
 config_templates:
   - name: endpoint
-    title: Endpoint data source
+    title: Elastic Endpoint Security data source
     description: Interact with the endpoint.
 
     # This tells the UI that for configuration, it must link to a specific solution