Skip to content

Add a new dataset to include both metrics and logs for the active integrations and agent charts #7674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Add a new dataset to include both metrics and logs for the active integrations and agent charts #7674

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beabd41
Add a new dataset to include both metrics and logs for the active int…
amitkanfer Sep 6, 2023
762d397
6
amitkanfer Sep 6, 2023
f4e78b8
more chart fixes
amitkanfer Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add a new dataset to include both metrics and logs for the active int… 
…egrations and agent charts
  • Loading branch information
@amitkanfer
amitkanfer committed Sep 6, 2023
commit beabd416542ed71161089ffda572d4957332454a
7 changes: 6 additions & 1 deletion packages/elastic_agent/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# newer versions go on top
- version: "1.12.1"
changes:
- description: Add a new dataset to include both metrics and logs for the active integrations and agent charts
type: enhancement
link: https://github.com/elastic/integrations/pull/7476
- version: "1.12.0"
changes:
- description: Add metrics for queue depth, output batch size and output batch rate.
type: enhancement
link: https://github.com/elastic/integrations/pull/7476
link: https://github.com/elastic/integrations/pull/7611
- version: "1.11.2"
changes:
- description: Adding hyperlinks that works when installed on different spaces.
Expand Down
2 changes: 1 addition & 1 deletion ...es/elastic_agent/kibana/dashboard/elastic_agent-0600ffa0-6b5e-11ed-98de-67bdecd21824.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@
"version": 1
},
"coreMigrationVersion": "8.7.1",
"created_at": "2023-05-04T11:54:25.234Z",
"created_at": "2023-09-06T10:34:02.860Z",
"id": "elastic_agent-0600ffa0-6b5e-11ed-98de-67bdecd21824",
"migrationVersion": {
"dashboard": "8.7.0"
Expand Down
2 changes: 1 addition & 1 deletion ...es/elastic_agent/kibana/dashboard/elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
"version": 1
},
"coreMigrationVersion": "8.7.1",
"created_at": "2023-05-04T11:55:03.107Z",
"created_at": "2023-09-06T10:34:02.860Z",
"id": "elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824",
"migrationVersion": {
"dashboard": "8.7.0"
Expand Down
96 changes: 45 additions & 51 deletions ...es/elastic_agent/kibana/dashboard/elastic_agent-a148dc70-6b3c-11ed-98de-67bdecd21824.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,20 +519,21 @@
{
"embeddableConfig": {
"attributes": {
"references": [
{
"id": "logs-*",
"name": "indexpattern-datasource-layer-6c39da5e-0bfa-4ac0-b52c-75491ad21e8a",
"type": "index-pattern"
},
{
"id": "logs-*",
"name": "fbb56fc8-f301-483f-8d45-f6b2203ed246",
"type": "index-pattern"
}
],
"references": [],
"state": {
"adHocDataViews": {},
"adHocDataViews": {
"cd1d606c-b055-4564-b684-4fba543190d7": {
"allowNoIndex": false,
"fieldAttrs": {},
"fieldFormats": {},
"id": "cd1d606c-b055-4564-b684-4fba543190d7",
"name": "logs-*, metrics-*",
"runtimeFieldMap": {},
"sourceFilters": [],
"timeFieldName": "@timestamp",
"title": "logs-*,metrics-*"
}
},
"datasourceStates": {
"formBased": {
"layers": {
Expand Down Expand Up @@ -591,7 +592,7 @@
"meta": {
"alias": null,
"disabled": false,
"index": "fbb56fc8-f301-483f-8d45-f6b2203ed246",
"index": "cd1d606c-b055-4564-b684-4fba543190d7",
"key": "data_stream.dataset",
"negate": true,
"params": {
Expand All @@ -606,7 +607,13 @@
}
}
],
"internalReferences": [],
"internalReferences": [
{
"id": "cd1d606c-b055-4564-b684-4fba543190d7",
"name": "indexpattern-datasource-layer-6c39da5e-0bfa-4ac0-b52c-75491ad21e8a",
"type": "index-pattern"
}
],
"query": {
"language": "kuery",
"query": ""
Expand Down Expand Up @@ -859,20 +866,21 @@
{
"embeddableConfig": {
"attributes": {
"references": [
{
"id": "logs-*",
"name": "indexpattern-datasource-layer-06e5675e-d8f9-45b5-ba57-bae75a6eab02",
"type": "index-pattern"
},
{
"id": "logs-*",
"name": "0769541a-e3f2-49c1-beb8-aaf9ecf101e2",
"type": "index-pattern"
}
],
"references": [],
"state": {
"adHocDataViews": {},
"adHocDataViews": {
"add3e5b6-18cd-45f2-b47a-406dd1a1e38b": {
"allowNoIndex": false,
"fieldAttrs": {},
"fieldFormats": {},
"id": "add3e5b6-18cd-45f2-b47a-406dd1a1e38b",
"name": "logs-*, metrics-*",
"runtimeFieldMap": {},
"sourceFilters": [],
"timeFieldName": "@timestamp",
"title": "logs-*,metrics-*"
}
},
"datasourceStates": {
"formBased": {
"layers": {
Expand Down Expand Up @@ -932,7 +940,7 @@
"meta": {
"alias": null,
"disabled": false,
"index": "0769541a-e3f2-49c1-beb8-aaf9ecf101e2",
"index": "add3e5b6-18cd-45f2-b47a-406dd1a1e38b",
"key": "data_stream.dataset",
"negate": true,
"params": {
Expand All @@ -947,7 +955,13 @@
}
}
],
"internalReferences": [],
"internalReferences": [
{
"id": "add3e5b6-18cd-45f2-b47a-406dd1a1e38b",
"name": "indexpattern-datasource-layer-06e5675e-d8f9-45b5-ba57-bae75a6eab02",
"type": "index-pattern"
}
],
"query": {
"language": "kuery",
"query": ""
Expand Down Expand Up @@ -1181,7 +1195,7 @@
"version": 1
},
"coreMigrationVersion": "8.7.1",
"created_at": "2023-05-04T11:53:36.738Z",
"created_at": "2023-09-06T10:37:03.097Z",
"id": "elastic_agent-a148dc70-6b3c-11ed-98de-67bdecd21824",
"migrationVersion": {
"dashboard": "8.7.0"
Expand Down Expand Up @@ -1227,16 +1241,6 @@
"name": "e8be8d39-4557-4077-bf45-e8c481f90699:drilldown:DASHBOARD_TO_DASHBOARD_DRILLDOWN:1c9c2911-505b-4aae-92d9-ae278ab4a378:dashboardId",
"type": "dashboard"
},
{
"id": "logs-*",
"name": "b197eb2e-ee86-490c-afe1-605ce8e2edc1:indexpattern-datasource-layer-6c39da5e-0bfa-4ac0-b52c-75491ad21e8a",
"type": "index-pattern"
},
{
"id": "logs-*",
"name": "b197eb2e-ee86-490c-afe1-605ce8e2edc1:fbb56fc8-f301-483f-8d45-f6b2203ed246",
"type": "index-pattern"
},
{
"id": "elastic_agent-0600ffa0-6b5e-11ed-98de-67bdecd21824",
"name": "b197eb2e-ee86-490c-afe1-605ce8e2edc1:drilldown:DASHBOARD_TO_DASHBOARD_DRILLDOWN:8b6dea27-19d8-4cbd-bc1a-cc1f5dd63544:dashboardId",
Expand All @@ -1257,16 +1261,6 @@
"name": "d9875e32-dd5f-4084-81c5-262f7bd0ccba:drilldown:DASHBOARD_TO_DASHBOARD_DRILLDOWN:ff1c170b-d997-40ef-9093-ca8265c8c031:dashboardId",
"type": "dashboard"
},
{
"id": "logs-*",
"name": "9ea33099-240d-4f37-b154-216aaccb6f4a:indexpattern-datasource-layer-06e5675e-d8f9-45b5-ba57-bae75a6eab02",
"type": "index-pattern"
},
{
"id": "logs-*",
"name": "9ea33099-240d-4f37-b154-216aaccb6f4a:0769541a-e3f2-49c1-beb8-aaf9ecf101e2",
"type": "index-pattern"
},
{
"id": "elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824",
"name": "9ea33099-240d-4f37-b154-216aaccb6f4a:drilldown:DASHBOARD_TO_DASHBOARD_DRILLDOWN:7c5aeb9a-d5d0-4e3a-89c0-98bb2f46e6cc:dashboardId",
Expand Down
2 changes: 1 addition & 1 deletion packages/elastic_agent/kibana/search/elastic_agent-462b68c0-b10b-11ed-957f-f1c897630287.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"usesAdHocDataView": false
},
"coreMigrationVersion": "8.7.1",
"created_at": "2023-05-04T11:30:29.478Z",
"created_at": "2023-09-06T10:34:02.860Z",
"id": "elastic_agent-462b68c0-b10b-11ed-957f-f1c897630287",
"migrationVersion": {
"search": "8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/elastic_agent/kibana/search/elastic_agent-522c9e20-ad53-11ed-957f-f1c897630287.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"usesAdHocDataView": false
},
"coreMigrationVersion": "8.7.1",
"created_at": "2023-05-04T11:30:29.478Z",
"created_at": "2023-09-06T10:34:02.860Z",
"id": "elastic_agent-522c9e20-ad53-11ed-957f-f1c897630287",
"migrationVersion": {
"search": "8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/elastic_agent/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: elastic_agent
title: Elastic Agent
version: 1.12.0
version: 1.12.1
description: Collect logs and metrics from Elastic Agents.
type: integration
format_version: 1.0.0
Expand Down