Skip to content

Commit 9cded36

Browse files
authored
Make Istio integration GA (#4924)
* monitor istiod service with leaderelection * change PR link
1 parent 98f453e commit 9cded36

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

packages/istio/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "0.2.2"
3+
changes:
4+
- description: Monitor Istiod service
5+
type: enhancement # can be one of: enhancement, bugfix, breaking-change
6+
link: https://github.com/elastic/integrations/pull/4924
27
- version: "0.2.1"
38
changes:
49
- description: Metrics for Istiod and Proxy sidecar container

packages/istio/data_stream/istiod_metrics/_dev/test/system/test-default-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ data_stream:
55
hosts:
66
- "http://{{Hostname}}:8080"
77
metrics_path: "/metrics/istiod.txt"
8-
condition: "true"
8+
leaderelection: false

packages/istio/data_stream/istiod_metrics/agent/stream/stream.yml.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ hosts:
44
{{#each hosts}}
55
- {{this}}
66
{{/each}}
7-
condition: {{ condition }}
7+
{{#if leaderelection}}
8+
condition: ${kubernetes_leaderelection.leader} == true
9+
{{/if}}
810
{{#if metrics_path}}
911
metrics_path: {{metrics_path}}
1012
{{/if}}

packages/istio/data_stream/istiod_metrics/manifest.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ streams:
2020
required: true
2121
show_user: true
2222
default:
23-
- ${kubernetes.pod.ip}:15014
23+
- istiod.istio-system:15014
2424
- name: metrics_path
2525
type: text
2626
title: Metrics Path
@@ -29,14 +29,13 @@ streams:
2929
show_user: true
3030
default:
3131
- /metrics
32-
- name: condition
33-
title: Condition
34-
description: Condition to filter when to apply this datastream
35-
type: text
32+
- name: leaderelection
33+
type: bool
34+
title: Leader Election
3635
multi: false
3736
required: true
3837
show_user: true
39-
default: ${kubernetes.labels.app} == 'istiod' and ${kubernetes.annotations.prometheus.io/scrape} == 'true'
38+
default: true
4039
- name: metrics_filters.exclude
4140
type: text
4241
title: Metrics Filters Exclude

packages/istio/manifest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: istio
33
title: Istio
44
description: Collect logs and metrics from the service mesh Istio with Elastic Agent.
55
type: integration
6-
version: 0.2.1
6+
version: 0.2.2
77
release: beta
88
license: basic
99
categories:
@@ -16,7 +16,7 @@ screenshots:
1616
- src: /img/istio_traffic.png
1717
title: Istio Traffic
1818
size: 1705x851
19-
type: image/png
19+
type: image/png
2020
- src: /img/istio_overview.png
2121
title: Istio Overview
2222
size: 1699x1064

0 commit comments

Comments
 (0)