Skip to content

Commit

Permalink
es-313 Add configuration support for scrape interval in Target Alloca…
Browse files Browse the repository at this point in the history
…tor (#93)

* added scrape interval configuration condition

* added scrapeInterval to  schema

* added scrapeInterval default value

* chart version bump

* changelog

* chagelog version

* Update charts/opentelemetry-collector/templates/configmap-targetallocator.yaml

Co-authored-by: Nicolas Takashi <[email protected]>

* adjust bad version

* update changelog

* re-generated examples

* changelog date

---------

Co-authored-by: Nicolas Takashi <[email protected]>
  • Loading branch information
daidokoro and nicolastakashi committed Aug 7, 2024
1 parent 5e4cbb1 commit 4c23e23
Show file tree
Hide file tree
Showing 106 changed files with 135 additions and 125 deletions.
2 changes: 2 additions & 0 deletions charts/opentelemetry-collector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## OpenTelemetry Collector
### v0.88.6 / 2024-08-07
- [Feat] Allow configuration of scrape interval value for target allocator prometheus custom resources.

### v0.88.5 / 2024-08-05
- [Feat] add more system attributes to host entity event preset
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.88.5
version: 0.88.6
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 091fd8414421ecddee507af9ed0c9501e87a5d519a5b5f5e6aac351afef6b74c
checksum/config: 8ff3d814df00537efc886eb03af8af9d5a882c7841c62b7677bccf03cc98f4f0

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 13193ef47af0d503d1c3063b77e82cae34e633d0b32af0d8d3d163ea37989e84
checksum/config: 5e7f56ce87f520196d01e2697f634989bc845f65fa72f0a7a7e3ec3e1e09cf4d

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: e32ef58d4fe4929b4e287fde3cd7cb40c33f1b9969a443d850742a61f2effad5
checksum/config: 6a9e3a8112ff9838ec0a52e0d200391bbbc1171d3bd81450b1eb9759c5e7ae68

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: de9f6d563e875e795e3de9ae01e860db399cfd8e228c49f41b081444cb5402cb
checksum/config: fedb9ddcc0c52654cc9c805c412f8dc04de6785e10e59ab460145e3001c1f283

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: de9f6d563e875e795e3de9ae01e860db399cfd8e228c49f41b081444cb5402cb
checksum/config: fedb9ddcc0c52654cc9c805c412f8dc04de6785e10e59ab460145e3001c1f283

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 1e4a98a0bd480afcdf206cdb7fc66b8869f19f3f14f880520e7833fe0df05987
checksum/config: 67ad8f0e6c298fab47d85124cd2afe595d4c7572374b9dba9de8fbedcd89bf3c

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector-targetallocator
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector-targetallocator
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector-target-allocator
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 688dc1aed16d717c8ae3efc14a4f4acb2b45172cff7e9619368226e3ea7092a9
checksum/config: 3d8c845ff5c6dc7116615309019864ba6d68b9b65dc1ea2d6ac69f1cdefde8ec

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 7bffc2c1816c6985f02e862f2d1512b26ed27db471d8da8bd47d39adddfbc19c
checksum/config: 95b81e53c803508c16e6043227d961ba525f8a404a341b6e1c9751313fb43599

labels:
app.kubernetes.io/name: opentelemetry-collector-target-allocator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector-target-allocator
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector-targetallocator
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector-target-allocator
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.88.5
helm.sh/chart: opentelemetry-collector-0.88.6
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.106.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: da8ea6717d49dd390a32597e8aa9512fcefc1c2ca2aac86d4d9d875182db10a9
checksum/config: 515d58be7ff6029c23b29280a33658ed2aa943075abe8d9f94245d84a8ad57ae

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Loading

0 comments on commit 4c23e23

Please sign in to comment.