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.

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

Jump to bottom

[elasticsearch] add api_key authentication #7637

Merged
merged 2 commits into from
Sep 8, 2023
Merged

[elasticsearch] add api_key authentication #7637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f25bf2
add api_key authentication
klacabane Sep 1, 2023
8d7f263
changelog
klacabane Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/elasticsearch/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.10.0"
changes:
- description: Add support for api_key authentication
type: enhancement
link: https://github.com/elastic/integrations/pull/7637
- version: "1.9.0"
changes:
- description: Enable time series data streams for the metrics datasets Index, Index Summary, Index Recovery, ML Job, Ingest Pipeline, Node and Node Stats. This improves storage usage and query performance. For more details, see https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds.html
Expand Down
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/ccr/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/cluster_stats/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/enrich/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/index/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/index_recovery/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -25,4 +28,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/index_summary/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
3 changes: 3 additions & 0 deletions packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand Down
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/ml_job/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/node/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/node_stats/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/pending_tasks/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
5 changes: 4 additions & 1 deletion packages/elasticsearch/data_stream/shard/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ username: {{username}}
{{#if password}}
password: {{password}}
{{/if}}
{{#if api_key}}
api_key: {{api_key}}
{{/if}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
Expand All @@ -24,4 +27,4 @@ condition: ${kubernetes_leaderelection.leader} == true
{{#if condition }}
condition: {{ condition }}
{{/if}}
{{/if}}
{{/if}}
11 changes: 9 additions & 2 deletions packages/elasticsearch/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: elasticsearch
title: Elasticsearch
version: 1.9.0
version: 1.10.0
description: Elasticsearch Integration
type: integration
icons:
Expand All @@ -12,7 +12,7 @@ format_version: 2.6.0
categories: ["elastic_stack", "datastore"]
conditions:
elastic.subscription: basic
kibana.version: ^8.8.0
kibana.version: ^8.10.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Underlying beats support was added in 8.10

owner:
github: elastic/infra-monitoring-ui
policy_templates:
Expand Down Expand Up @@ -57,6 +57,13 @@ policy_templates:
multi: false
required: false
show_user: false
- name: api_key
type: password
title: API Key
description: Elasticsearch API Key in Beats format. Use when connecting to elasticsearch in place of username/password.
multi: false
required: false
show_user: false
- name: scope
type: select
title: Scope
Expand Down