diff --git a/packages/elasticsearch/changelog.yml b/packages/elasticsearch/changelog.yml index da84429c6ac5..0613bb82dc56 100644 --- a/packages/elasticsearch/changelog.yml +++ b/packages/elasticsearch/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.14.0" + changes: + - description: Add support for tags + type: enhancement + link: https://github.com/elastic/integrations/pull/9028 - version: "1.13.1" changes: - description: Make "Total Storage over time" viz consistent with others by using same sourceField diff --git a/packages/elasticsearch/data_stream/audit/agent/stream/log.yml.hbs b/packages/elasticsearch/data_stream/audit/agent/stream/log.yml.hbs index dbb3d8ec36b5..383aa3be0b96 100644 --- a/packages/elasticsearch/data_stream/audit/agent/stream/log.yml.hbs +++ b/packages/elasticsearch/data_stream/audit/agent/stream/log.yml.hbs @@ -2,6 +2,10 @@ paths: {{#each paths as |path i|}} - {{path}} {{/each}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition}} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/audit/manifest.yml b/packages/elasticsearch/data_stream/audit/manifest.yml index 786583575ce5..2bdd018b00e2 100644 --- a/packages/elasticsearch/data_stream/audit/manifest.yml +++ b/packages/elasticsearch/data_stream/audit/manifest.yml @@ -11,6 +11,12 @@ streams: show_user: true default: - /var/log/elasticsearch/*_audit.json + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false template_path: log.yml.hbs title: Audit logs description: Collect Elasticsearch audit logs using log input diff --git a/packages/elasticsearch/data_stream/ccr/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/ccr/agent/stream/stream.yml.hbs index 1b5dbca372f9..6d6d98061502 100644 --- a/packages/elasticsearch/data_stream/ccr/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/ccr/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/ccr/manifest.yml b/packages/elasticsearch/data_stream/ccr/manifest.yml index 464aaef5ce35..58b4bd72944a 100644 --- a/packages/elasticsearch/data_stream/ccr/manifest.yml +++ b/packages/elasticsearch/data_stream/ccr/manifest.yml @@ -17,3 +17,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/cluster_stats/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/cluster_stats/agent/stream/stream.yml.hbs index 009433c81284..2b63448e9c39 100644 --- a/packages/elasticsearch/data_stream/cluster_stats/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/cluster_stats/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/cluster_stats/manifest.yml b/packages/elasticsearch/data_stream/cluster_stats/manifest.yml index 0b844d417103..fa573dc414a2 100644 --- a/packages/elasticsearch/data_stream/cluster_stats/manifest.yml +++ b/packages/elasticsearch/data_stream/cluster_stats/manifest.yml @@ -17,3 +17,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/deprecation/agent/stream/log.yml.hbs b/packages/elasticsearch/data_stream/deprecation/agent/stream/log.yml.hbs index c10163dea793..3a33108473f6 100644 --- a/packages/elasticsearch/data_stream/deprecation/agent/stream/log.yml.hbs +++ b/packages/elasticsearch/data_stream/deprecation/agent/stream/log.yml.hbs @@ -2,6 +2,10 @@ paths: {{#each paths as |path i|}} - {{path}} {{/each}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition}} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/deprecation/manifest.yml b/packages/elasticsearch/data_stream/deprecation/manifest.yml index 01ac75f8f1dd..0853d005812e 100644 --- a/packages/elasticsearch/data_stream/deprecation/manifest.yml +++ b/packages/elasticsearch/data_stream/deprecation/manifest.yml @@ -11,6 +11,12 @@ streams: show_user: true default: - /var/log/elasticsearch/*_deprecation.json + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false template_path: log.yml.hbs title: Deprecation logs description: Collect Elasticsearch deprecation logs using log input diff --git a/packages/elasticsearch/data_stream/enrich/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/enrich/agent/stream/stream.yml.hbs index 22a2a68cf87a..cf574e56482b 100644 --- a/packages/elasticsearch/data_stream/enrich/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/enrich/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/enrich/manifest.yml b/packages/elasticsearch/data_stream/enrich/manifest.yml index f19b80cf32cb..48f416cfeeae 100644 --- a/packages/elasticsearch/data_stream/enrich/manifest.yml +++ b/packages/elasticsearch/data_stream/enrich/manifest.yml @@ -17,3 +17,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/gc/agent/stream/log.yml.hbs b/packages/elasticsearch/data_stream/gc/agent/stream/log.yml.hbs index f1a9a299bf2c..3c6d5e09b102 100644 --- a/packages/elasticsearch/data_stream/gc/agent/stream/log.yml.hbs +++ b/packages/elasticsearch/data_stream/gc/agent/stream/log.yml.hbs @@ -2,6 +2,10 @@ paths: {{#each paths as |path i|}} - {{path}} {{/each}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition}} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/gc/manifest.yml b/packages/elasticsearch/data_stream/gc/manifest.yml index b2d07508e53f..171778e451db 100644 --- a/packages/elasticsearch/data_stream/gc/manifest.yml +++ b/packages/elasticsearch/data_stream/gc/manifest.yml @@ -12,6 +12,12 @@ streams: default: - /var/log/elasticsearch/gc.log.[0-9]* - /var/log/elasticsearch/gc.log + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false template_path: log.yml.hbs title: Garbage Collection logs description: Collect Elasticsearch gc logs using log input diff --git a/packages/elasticsearch/data_stream/index/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/index/agent/stream/stream.yml.hbs index 788127f47a41..e850f4116997 100644 --- a/packages/elasticsearch/data_stream/index/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/index/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/index/manifest.yml b/packages/elasticsearch/data_stream/index/manifest.yml index ae8d2db6a041..4bca9d225a14 100644 --- a/packages/elasticsearch/data_stream/index/manifest.yml +++ b/packages/elasticsearch/data_stream/index/manifest.yml @@ -18,3 +18,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/index_recovery/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/index_recovery/agent/stream/stream.yml.hbs index 27956a588e5d..0fedf2b561fe 100644 --- a/packages/elasticsearch/data_stream/index_recovery/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/index_recovery/agent/stream/stream.yml.hbs @@ -18,6 +18,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/index_recovery/manifest.yml b/packages/elasticsearch/data_stream/index_recovery/manifest.yml index 95454d88b254..4cddb483b966 100644 --- a/packages/elasticsearch/data_stream/index_recovery/manifest.yml +++ b/packages/elasticsearch/data_stream/index_recovery/manifest.yml @@ -25,3 +25,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/index_summary/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/index_summary/agent/stream/stream.yml.hbs index 8f9d6eed8f90..0f393a24d484 100644 --- a/packages/elasticsearch/data_stream/index_summary/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/index_summary/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/index_summary/manifest.yml b/packages/elasticsearch/data_stream/index_summary/manifest.yml index 0f309a736b0a..6b05eefa1d09 100644 --- a/packages/elasticsearch/data_stream/index_summary/manifest.yml +++ b/packages/elasticsearch/data_stream/index_summary/manifest.yml @@ -18,3 +18,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs index cb28b8febcee..078cd873e715 100644 --- a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/ingest_pipeline/manifest.yml b/packages/elasticsearch/data_stream/ingest_pipeline/manifest.yml index 7c7d10972ddf..1cc401080a15 100644 --- a/packages/elasticsearch/data_stream/ingest_pipeline/manifest.yml +++ b/packages/elasticsearch/data_stream/ingest_pipeline/manifest.yml @@ -19,4 +19,10 @@ streams: description: How often to collect the processor-level metrics. Number between 0 and 1. required: true show_user: true - default: "0.25" \ No newline at end of file + default: "0.25" + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false \ No newline at end of file diff --git a/packages/elasticsearch/data_stream/ml_job/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/ml_job/agent/stream/stream.yml.hbs index c1ecc3f727d3..89e05f43563f 100644 --- a/packages/elasticsearch/data_stream/ml_job/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/ml_job/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/ml_job/manifest.yml b/packages/elasticsearch/data_stream/ml_job/manifest.yml index bea3f2791073..c877d7256a43 100644 --- a/packages/elasticsearch/data_stream/ml_job/manifest.yml +++ b/packages/elasticsearch/data_stream/ml_job/manifest.yml @@ -18,3 +18,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/node/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/node/agent/stream/stream.yml.hbs index d48813bc6d5f..75446e13686a 100644 --- a/packages/elasticsearch/data_stream/node/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/node/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/node/manifest.yml b/packages/elasticsearch/data_stream/node/manifest.yml index 5d314720aae2..75eeaad4e195 100644 --- a/packages/elasticsearch/data_stream/node/manifest.yml +++ b/packages/elasticsearch/data_stream/node/manifest.yml @@ -18,3 +18,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/node_stats/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/node_stats/agent/stream/stream.yml.hbs index 22540bbc057e..45c0d5f3dce1 100644 --- a/packages/elasticsearch/data_stream/node_stats/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/node_stats/agent/stream/stream.yml.hbs @@ -17,6 +17,10 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if leaderelection }} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} diff --git a/packages/elasticsearch/data_stream/node_stats/manifest.yml b/packages/elasticsearch/data_stream/node_stats/manifest.yml index 5797dae7191f..6eaf5335793d 100644 --- a/packages/elasticsearch/data_stream/node_stats/manifest.yml +++ b/packages/elasticsearch/data_stream/node_stats/manifest.yml @@ -18,3 +18,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/pending_tasks/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/pending_tasks/agent/stream/stream.yml.hbs index b954f53394b5..7207c49a0d9c 100644 --- a/packages/elasticsearch/data_stream/pending_tasks/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/pending_tasks/agent/stream/stream.yml.hbs @@ -18,6 +18,10 @@ period: {{period}} ssl: {{ssl}} {{/if}} {{#if leaderelection }} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition }} condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} {{ else }} diff --git a/packages/elasticsearch/data_stream/pending_tasks/manifest.yml b/packages/elasticsearch/data_stream/pending_tasks/manifest.yml index ffd3e9f49807..082aa777f128 100644 --- a/packages/elasticsearch/data_stream/pending_tasks/manifest.yml +++ b/packages/elasticsearch/data_stream/pending_tasks/manifest.yml @@ -17,3 +17,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/server/agent/stream/log.yml.hbs b/packages/elasticsearch/data_stream/server/agent/stream/log.yml.hbs index 698ed7ea9c89..c68619d04acc 100644 --- a/packages/elasticsearch/data_stream/server/agent/stream/log.yml.hbs +++ b/packages/elasticsearch/data_stream/server/agent/stream/log.yml.hbs @@ -2,6 +2,10 @@ paths: {{#each paths as |path i|}} - {{path}} {{/each}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition}} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/server/manifest.yml b/packages/elasticsearch/data_stream/server/manifest.yml index a60316096c59..c366c8870f65 100644 --- a/packages/elasticsearch/data_stream/server/manifest.yml +++ b/packages/elasticsearch/data_stream/server/manifest.yml @@ -11,6 +11,12 @@ streams: show_user: true default: - /var/log/elasticsearch/*_server.json + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false template_path: log.yml.hbs title: Server logs description: Collect server logs using log input diff --git a/packages/elasticsearch/data_stream/shard/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/shard/agent/stream/stream.yml.hbs index e1c030816103..906df9fd0168 100644 --- a/packages/elasticsearch/data_stream/shard/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/shard/agent/stream/stream.yml.hbs @@ -24,6 +24,10 @@ condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} condition: ${kubernetes_leaderelection.leader} == true {{/if}} {{ else }} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition }} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/shard/manifest.yml b/packages/elasticsearch/data_stream/shard/manifest.yml index aadc08a536db..e93583a0ad73 100644 --- a/packages/elasticsearch/data_stream/shard/manifest.yml +++ b/packages/elasticsearch/data_stream/shard/manifest.yml @@ -17,3 +17,9 @@ streams: required: true show_user: true default: 10s + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false diff --git a/packages/elasticsearch/data_stream/slowlog/agent/stream/log.yml.hbs b/packages/elasticsearch/data_stream/slowlog/agent/stream/log.yml.hbs index 809534c4e1ec..a5e3b2d457b7 100644 --- a/packages/elasticsearch/data_stream/slowlog/agent/stream/log.yml.hbs +++ b/packages/elasticsearch/data_stream/slowlog/agent/stream/log.yml.hbs @@ -2,6 +2,10 @@ paths: {{#each paths as |path i|}} - {{path}} {{/each}} +tags: +{{#each tags as |tag|}} + - {{tag}} +{{/each}} {{#if condition}} condition: {{ condition }} {{/if}} diff --git a/packages/elasticsearch/data_stream/slowlog/manifest.yml b/packages/elasticsearch/data_stream/slowlog/manifest.yml index 1f7803346f47..de703082e3cf 100644 --- a/packages/elasticsearch/data_stream/slowlog/manifest.yml +++ b/packages/elasticsearch/data_stream/slowlog/manifest.yml @@ -12,6 +12,12 @@ streams: default: - /var/log/elasticsearch/*_index_search_slowlog.json - /var/log/elasticsearch/*_index_indexing_slowlog.json + - name: tags + type: text + title: Tags + multi: true + required: false + show_user: false template_path: log.yml.hbs title: Slowlog logs description: Collect Elasticsearch slowlog logs using log input diff --git a/packages/elasticsearch/manifest.yml b/packages/elasticsearch/manifest.yml index c2f709acca2f..6a10900215d1 100644 --- a/packages/elasticsearch/manifest.yml +++ b/packages/elasticsearch/manifest.yml @@ -1,6 +1,6 @@ name: elasticsearch title: Elasticsearch -version: 1.13.1 +version: 1.14.0 description: Elasticsearch Integration type: integration icons: