Skip to content
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.

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

[MongoDb] Tsdb enabled release #6692

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions packages/mongodb/_dev/deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVICE_VERSION=${SERVICE_VERSION:-3.4}
FROM mongo:${SERVICE_VERSION}
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y netcat
ARG MONGODB_VERSION=5.0
FROM mongo:${MONGODB_VERSION}
RUN apt update && yes | apt install netcat
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 27017
2 changes: 1 addition & 1 deletion packages/mongodb/_dev/deploy/docker/creator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVICE_VERSION=${SERVICE_VERSION:-3.4}
ARG SERVICE_VERSION=${SERVICE_VERSION:-5.0}
FROM mongo:${SERVICE_VERSION}
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y netcat
Expand Down
7 changes: 2 additions & 5 deletions packages/mongodb/_dev/deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ services:
mongodb:
build: creator
ports:
- 27017
command:
- '--replSet'
- 'beats'
- 27017:27017
mongodb-log:
image: docker.elastic.co/integrations-ci/beats-mongodb:${MONGODB_VERSION:-3.4}-1
image: docker.elastic.co/integrations-ci/beats-mongodb:${MONGODB_VERSION:-5.0}-1
user: root
build:
context: .
Expand Down
5 changes: 5 additions & 0 deletions packages/mongodb/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.11.0"
changes:
- description: Enable time series data streams for the metrics datasets. This dramatically reduces storage for metrics and is expected to progressively improve query performance. For more details, see https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds.html.
type: enhancement
link: https://github.com/elastic/integrations/pull/6692
- version: "1.10.2"
changes:
- description: Fix mongodb logs overview dashboard and update filters for panels.
Expand Down
2 changes: 2 additions & 0 deletions packages/mongodb/data_stream/collstats/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ streams:
default: 10s
title: MongoDB collstats metrics
description: Collect MongoDB collstats metrics
elasticsearch:
index_mode: "time_series"
65 changes: 30 additions & 35 deletions packages/mongodb/data_stream/collstats/sample_event.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,48 @@
{
"@timestamp": "2022-10-20T10:51:51.648Z",
"@timestamp": "2023-06-27T15:05:34.410Z",
"agent": {
"ephemeral_id": "069895c3-402a-45ff-9ddd-a50c62446502",
"hostname": "docker-fleet-agent",
"id": "a326ccf1-3f91-4412-bc97-215ea856cd16",
"ephemeral_id": "379d06ef-b1a1-4aae-a292-1bd3bc8e78df",
"id": "ee8ce08e-6f80-467d-a633-e9ff4ffdb266",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "7.14.0"
"version": "8.8.0"
},
"data_stream": {
"dataset": "mongodb.collstats",
"namespace": "ep",
"type": "metrics"
},
"ecs": {
"version": "8.5.1"
"version": "8.0.0"
},
"elastic_agent": {
"id": "a326ccf1-3f91-4412-bc97-215ea856cd16",
"id": "ee8ce08e-6f80-467d-a633-e9ff4ffdb266",
"snapshot": false,
"version": "7.14.0"
"version": "8.8.0"
},
"event": {
"agent_id_status": "verified",
"dataset": "mongodb.collstats",
"duration": 4040208,
"ingested": "2022-10-20T10:51:55.190132092Z",
"duration": 5036250,
"ingested": "2023-06-27T15:05:35Z",
"module": "mongodb"
},
"host": {
"architecture": "aarch64",
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "2347a1bd8a3945949da8ab5c29f60774",
"ip": [
"172.18.0.7"
],
"mac": [
"02:42:ac:12:00:07"
],
"id": "b5cb0e96dbea41d19c3216af1f327d73",
"ip": "192.168.48.7",
"mac": "02-42-C0-A8-30-07",
"name": "docker-fleet-agent",
"os": {
"codename": "AltArch",
"family": "redhat",
"kernel": "5.10.124-linuxkit",
"name": "CentOS Linux",
"platform": "centos",
"codename": "focal",
"family": "debian",
"kernel": "5.10.104-linuxkit",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "7 (AltArch)"
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"metricset": {
Expand All @@ -56,14 +51,14 @@
},
"mongodb": {
"collstats": {
"collection": "system.roles",
"collection": "oplog.rs",
"commands": {
"count": 0,
"time": {
"us": 0
}
},
"db": "admin",
"db": "local",
"getmore": {
"count": 0,
"time": {
Expand All @@ -78,23 +73,23 @@
},
"lock": {
"read": {
"count": 1,
"count": 17,
"time": {
"us": 19
"us": 68
}
},
"write": {
"count": 0,
"count": 1,
"time": {
"us": 0
"us": 7516
}
}
},
"name": "admin.system.roles",
"name": "local.oplog.rs",
"queries": {
"count": 1,
"count": 0,
"time": {
"us": 19
"us": 0
}
},
"remove": {
Expand All @@ -104,9 +99,9 @@
}
},
"total": {
"count": 1,
"count": 18,
"time": {
"us": 19
"us": 7584
}
},
"update": {
Expand All @@ -118,7 +113,7 @@
}
},
"service": {
"address": "mongodb://elastic-package-service-mongodb-1",
"address": "mongodb://elastic-package-service_mongodb_1",
"type": "mongodb"
}
}
2 changes: 2 additions & 0 deletions packages/mongodb/data_stream/dbstats/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ streams:
default: 10s
title: MongoDB dbstats metrics
description: Collect MongoDB dbstats metrics
elasticsearch:
index_mode: "time_series"
45 changes: 19 additions & 26 deletions packages/mongodb/data_stream/dbstats/sample_event.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,48 @@
{
"@timestamp": "2022-10-20T10:52:35.564Z",
"@timestamp": "2023-06-27T09:46:40.443Z",
"agent": {
"ephemeral_id": "cdd73778-56aa-4cc4-b9dd-f2e2202cfef6",
"hostname": "docker-fleet-agent",
"id": "a326ccf1-3f91-4412-bc97-215ea856cd16",
"ephemeral_id": "edda44e9-e81b-4916-a6dd-ad6716976001",
"id": "ee8ce08e-6f80-467d-a633-e9ff4ffdb266",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "7.14.0"
"version": "8.8.0"
},
"data_stream": {
"dataset": "mongodb.dbstats",
"namespace": "ep",
"type": "metrics"
},
"ecs": {
"version": "8.5.1"
"version": "8.0.0"
},
"elastic_agent": {
"id": "a326ccf1-3f91-4412-bc97-215ea856cd16",
"id": "ee8ce08e-6f80-467d-a633-e9ff4ffdb266",
"snapshot": false,
"version": "7.14.0"
"version": "8.8.0"
},
"event": {
"agent_id_status": "verified",
"dataset": "mongodb.dbstats",
"duration": 3442416,
"ingested": "2022-10-20T10:52:39.124852460Z",
"duration": 3543708,
"ingested": "2023-06-27T09:46:42Z",
"module": "mongodb"
},
"host": {
"architecture": "aarch64",
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "2347a1bd8a3945949da8ab5c29f60774",
"ip": [
"172.18.0.7"
],
"mac": [
"02:42:ac:12:00:07"
],
"id": "b5cb0e96dbea41d19c3216af1f327d73",
"ip": "192.168.48.7",
"mac": "02-42-C0-A8-30-07",
"name": "docker-fleet-agent",
"os": {
"codename": "AltArch",
"family": "redhat",
"kernel": "5.10.124-linuxkit",
"name": "CentOS Linux",
"platform": "centos",
"codename": "focal",
"family": "debian",
"kernel": "5.10.104-linuxkit",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "7 (AltArch)"
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"metricset": {
Expand All @@ -64,12 +59,10 @@
"bytes": 1566
},
"db": "local",
"file_size": {},
"index_size": {
"bytes": 12288
},
"indexes": 3,
"ns_size_mb": {},
"num_extents": 0,
"objects": 3,
"storage_size": {
Expand All @@ -78,7 +71,7 @@
}
},
"service": {
"address": "mongodb://elastic-package-service-mongodb-1",
"address": "mongodb://elastic-package-service_mongodb_1",
"type": "mongodb"
}
}
Loading