Migrate obs-infraobs-integrations to package-spec v3 #5 (#8234)

* [mongodb]: migrate to package-spec v3 * [influxdb]: migrate to package-spec v3 * fix pr number in changelog * remove release: beta from influxdb * [influxdb]: upgrade stack version
elastic · Oct 25, 2023 · 18bf78a · 18bf78a
1 parent 40b48e2
commit 18bf78a
Show file tree

Hide file tree

Showing 35 changed files with 114 additions and 103 deletions.
diff --git a/packages/influxdb/changelog.yml b/packages/influxdb/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 0.7.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8234
 - version: "0.6.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.

diff --git a/packages/influxdb/data_stream/advstatus/fields/ecs.yml b/packages/influxdb/data_stream/advstatus/fields/ecs.yml
@@ -18,7 +18,7 @@
   dimension: true
 - external: ecs
   name: cloud.availability_zone
-  dimension: true  
+  dimension: true
 - external: ecs
   name: cloud.instance.id
   dimension: true
@@ -30,4 +30,4 @@
   dimension: true
 - external: ecs
   name: host.name
-  dimension: true
+  dimension: true
diff --git a/packages/influxdb/data_stream/advstatus/fields/fields.yml b/packages/influxdb/data_stream/advstatus/fields/fields.yml
@@ -1,6 +1,5 @@
 - name: influxdb.advstatus
   type: group
-  release: beta
   fields:
     - name: instance
       type: keyword
@@ -41,7 +40,7 @@
           # Reason to add as a dimension field: To support different request handler type
           dimension: true
           description: Request handler.
-        - name: user_agent 
+        - name: user_agent
           type: keyword
           # Reason to add as a dimension field: To support multiple user agent type
           dimension: true
@@ -60,22 +59,22 @@
           type: keyword
           description: Bucket ID
           # Reason to add as a dimension field: To support more than one bucket ids
-          dimension: true 
+          dimension: true
         - name: taskid
           type: keyword
           description: Task ID of the influxdb tasks
           # Reason to add as a dimension field: To support multiple task id
           dimension: true
         - name: quantile
           type: keyword
-          description: Number that indicates the histogram quantile value. 
+          description: Number that indicates the histogram quantile value.
           # Reason to add as a dimension field: To support different quantile limit values
           dimension: true
         - name: method
           type: keyword
           description: Type of service operation
           # Reason to add as a dimension field: To support multiple service operation
-          dimension: true  
+          dimension: true
         - name: op
           type: keyword
           description: Extended information related to various operations

diff --git a/packages/influxdb/data_stream/advstatus/manifest.yml b/packages/influxdb/data_stream/advstatus/manifest.yml
@@ -23,9 +23,11 @@ streams:
         type: text
         title: Period
         default: 60s
-
 elasticsearch:
   index_mode: "time_series"
   index_template:
     settings:
-      index.mapping.dimension_fields.limit: 32
+      index:
+        mapping:
+          dimension_fields:
+            limit: 32
diff --git a/packages/influxdb/data_stream/status/fields/base-fields.yml b/packages/influxdb/data_stream/status/fields/base-fields.yml
@@ -11,4 +11,3 @@
 - name: '@timestamp'
   type: date
   description: Event timestamp.
-
diff --git a/packages/influxdb/data_stream/status/fields/ecs.yml b/packages/influxdb/data_stream/status/fields/ecs.yml
@@ -18,7 +18,7 @@
   dimension: true
 - external: ecs
   name: cloud.availability_zone
-  dimension: true  
+  dimension: true
 - external: ecs
   name: cloud.instance.id
   dimension: true
@@ -30,4 +30,4 @@
   dimension: true
 - external: ecs
   name: host.name
-  dimension: true
+  dimension: true
diff --git a/packages/influxdb/data_stream/status/fields/fields.yml b/packages/influxdb/data_stream/status/fields/fields.yml
@@ -1,6 +1,5 @@
 - name: influxdb.status
   type: group
-  release: beta
   fields:
     - name: instance
       type: keyword
@@ -45,7 +44,7 @@
           # Reason to add as a dimension field: To support different request handler type
           dimension: true
           description: Request handler.
-        - name: user_agent 
+        - name: user_agent
           type: keyword
           # Reason to add as a dimension field: To support multiple user agent type
           dimension: true
@@ -64,27 +63,27 @@
           type: keyword
           description: Bucket ID
           # Reason to add as a dimension field: To support more than one bucket ids
-          dimension: true 
+          dimension: true
         - name: taskid
           type: keyword
           # Reason to add as a dimension field: To support multiple task id
           description: Task ID of the influxdb tasks
           dimension: true
         - name: quantile
           type: keyword
-          description: Number that indicates the histogram quantile value. 
+          description: Number that indicates the histogram quantile value.
           # Reason to add as a dimension field: To support different quantile limit values
           dimension: true
         - name: method
           type: keyword
           description: Type of service operation
           # Reason to add as a dimension field: To support multiple service operation
-          dimension: true  
+          dimension: true
         - name: op
           type: keyword
           # Reason to add as a dimension field: To support multiple operation types
           description: Extended information related to various operations
-          dimension: true 
+          dimension: true
     - name: http_api_requests_total
       metric_type: counter
       type: double

diff --git a/packages/influxdb/data_stream/status/manifest.yml b/packages/influxdb/data_stream/status/manifest.yml
@@ -23,9 +23,11 @@ streams:
         type: text
         title: Period
         default: 60s
-
 elasticsearch:
   index_mode: "time_series"
   index_template:
     settings:
-      index.mapping.dimension_fields.limit: 32
+      index:
+        mapping:
+          dimension_fields:
+            limit: 32
diff --git a/packages/influxdb/manifest.yml b/packages/influxdb/manifest.yml
@@ -1,15 +1,17 @@
-format_version: 1.0.0
+format_version: "3.0.0"
 name: influxdb
 title: "InfluxDb"
-version: "0.6.0"
-license: basic
+version: "0.7.0"
 description: "Collect metrics from Influxdb database"
 type: integration
 categories:
   - datastore
   - observability
 conditions:
-  kibana.version: "^8.8.0"
+  kibana:
+    version: "^8.9.0"
+  elastic:
+    subscription: basic
 screenshots:
   - src: /img/Influxdb-status.png
     title: Influxdb status metrics dashboard
@@ -44,3 +46,4 @@ policy_templates:
         input_group: metrics
 owner:
   github: elastic/obs-infraobs-integrations
+  type: elastic
diff --git a/packages/influxdb/validation.yml b/packages/influxdb/validation.yml
@@ -0,0 +1,3 @@
+errors:
+  exclude_checks:
+    - SVR00002
diff --git a/packages/mongodb/_dev/deploy/docker/docker-compose.yml b/packages/mongodb/_dev/deploy/docker/docker-compose.yml
@@ -16,3 +16,4 @@ services:
       - ${SERVICE_LOGS_DIR}:/var/log/mongodb
     entrypoint: >
       bash -c "chmod a+wx /var/log/mongodb && chmod a+r -R /var/log/mongodb && touch /var/log/mongodb/mongod.log && chmod 644 /var/log/mongodb/mongod.log && mongod --replSet beats --logpath /var/log/mongodb/mongod.log --logappend"
+
diff --git a/packages/mongodb/changelog.yml b/packages/mongodb/changelog.yml
@@ -1,3 +1,8 @@
+- version: 1.12.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8234
 - 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.
@@ -133,7 +138,6 @@
     - description: Update to ECS 8.0
       type: enhancement
       link: https://github.com/elastic/integrations/pull/2494
-# newer versions go on top
 - version: "1.2.0"
   changes:
     - description: Release mongodb package for v8.0.0

diff --git a/packages/mongodb/data_stream/collstats/fields/agent.yml b/packages/mongodb/data_stream/collstats/fields/agent.yml
@@ -210,4 +210,4 @@
     - name: id
       type: keyword
       ignore_above: 1024
-      dimension: true
+      dimension: true
diff --git a/packages/mongodb/data_stream/collstats/fields/base-fields.yml b/packages/mongodb/data_stream/collstats/fields/base-fields.yml
@@ -18,7 +18,3 @@
 - name: '@timestamp'
   type: date
   description: Event timestamp.
-- name: service.address
-  type: keyword
-  dimension: true
-  description: Address of the machine where the service is running.
diff --git a/packages/mongodb/data_stream/collstats/fields/ecs.yml b/packages/mongodb/data_stream/collstats/fields/ecs.yml
@@ -2,5 +2,6 @@
   name: ecs.version
 - external: ecs
   name: service.address
+  dimension: true
 - external: ecs
   name: service.type
diff --git a/packages/mongodb/data_stream/dbstats/fields/agent.yml b/packages/mongodb/data_stream/dbstats/fields/agent.yml
@@ -210,4 +210,4 @@
     - name: id
       type: keyword
       ignore_above: 1024
-      dimension: true
+      dimension: true
diff --git a/packages/mongodb/data_stream/dbstats/fields/base-fields.yml b/packages/mongodb/data_stream/dbstats/fields/base-fields.yml
@@ -18,7 +18,3 @@
 - name: '@timestamp'
   type: date
   description: Event timestamp.
-- name: service.address
-  type: keyword
-  dimension: true
-  description: Address of the machine where the service is running.
diff --git a/packages/mongodb/data_stream/dbstats/fields/ecs.yml b/packages/mongodb/data_stream/dbstats/fields/ecs.yml
@@ -2,5 +2,6 @@
   name: ecs.version
 - external: ecs
   name: service.address
+  dimension: true
 - external: ecs
   name: service.type
diff --git a/packages/mongodb/data_stream/dbstats/manifest.yml b/packages/mongodb/data_stream/dbstats/manifest.yml
@@ -13,4 +13,4 @@ streams:
     title: MongoDB dbstats metrics
     description: Collect MongoDB dbstats metrics
 elasticsearch:
-  index_mode: "time_series"
+  index_mode: "time_series"
diff --git a/packages/mongodb/data_stream/log/_dev/test/pipeline/test-common-config.yml b/packages/mongodb/data_stream/log/_dev/test/pipeline/test-common-config.yml
@@ -1,5 +1,5 @@
 dynamic_fields:
-  event.ingested: ".*"
+  "event.ingested": ".*"
 fields:
   "@timestamp": "2020-04-28T11:07:58.223Z"
   tags:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@
		- name: '@timestamp'
		type: date
		description: Event timestamp.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ services:
		- ${SERVICE_LOGS_DIR}:/var/log/mongodb
		entrypoint: >
		bash -c "chmod a+wx /var/log/mongodb && chmod a+r -R /var/log/mongodb && touch /var/log/mongodb/mongod.log && chmod 644 /var/log/mongodb/mongod.log && mongod --replSet beats --logpath /var/log/mongodb/mongod.log --logappend"