Skip to content

Commit

Permalink
Merge branch 'main' into ingest-cluster-receiver-events-into-index-fr…
Browse files Browse the repository at this point in the history
…om-annotation
  • Loading branch information
pszkamruk-splunk committed Nov 21, 2024
2 parents 1b6293b + c4c103f commit d8af057
Show file tree
Hide file tree
Showing 358 changed files with 821 additions and 823 deletions.
12 changes: 12 additions & 0 deletions .chloggen/fix-operator-inst-bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
component: agent
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix bug where sometimes Instrumentation opentelemetry.io/v1alpha1 can be installed too early
# One or more tracking issues related to the change
issues: [1544]
# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
<!-- For unreleased changes, see entries in .chloggen -->
<!-- next version -->

## [0.112.1] - 2024-11-20

This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.112.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.112.0).

### 🧰 Bug fixes 🧰

- `agent`: Fix bug where hostmetrics receiver was failing to scrape the filesystem ([#1533](https://github.com/signalfx/splunk-otel-collector-chart/pull/1533))
- `operator`: Fix bug where sometimes Instrumentation opentelemetry.io/v1alpha1 can be installed too early ([#1544](https://github.com/signalfx/splunk-otel-collector-chart/pull/1544))

## [0.112.0] - 2024-11-07

This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.112.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.112.0).
Expand Down
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ install-tools: ## Install tools (macOS/Linux)
.PHONY: dep-update
dep-update: ## Fetch Helm chart dependency repositories, build the Helm chart with the dependencies specified in the Chart.yaml
@{ \
DIR=helm-charts/splunk-otel-collector ;\
LOCK_FILE=$$DIR/Chart.lock ;\
if [ -f "$$LOCK_FILE" ] ; then \
echo "Removing existing Chart.lock file..."; \
rm -f "$$LOCK_FILE" || exit 1; \
fi ;\
if ! (helm repo list | grep -q open-telemetry) ; then \
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts || exit 1; \
fi ;\
Expand All @@ -51,10 +57,13 @@ dep-update: ## Fetch Helm chart dependency repositories, build the Helm chart wi
fi ;\
helm repo update open-telemetry jetstack || exit 1; \
DEP_OK=true ;\
DIR=helm-charts/splunk-otel-collector ;\
if ! helm dependencies list $$DIR | grep open-telemetry | grep -q ok ; then DEP_OK=false ; fi ;\
if ! helm dependencies list $$DIR | grep jetstack | grep -q ok ; then DEP_OK=false ; fi ;\
if [ "$$DEP_OK" = "false" ] ; then helm dependencies update $$DIR || exit 1; fi ;\
if [ -f "$$LOCK_FILE" ] ; then \
echo "Removing Chart.lock file post-update..."; \
rm -f "$$LOCK_FILE" || exit 1; \
fi ;\
}

# Example Usage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
data:
Expand Down Expand Up @@ -304,7 +304,6 @@ data:
endpoint: 0.0.0.0:8006
hostmetrics:
collection_interval: 10s
root_path: /hostfs
scrapers:
cpu: null
disk: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
spec:
Expand All @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5897f0d311d853e5dc4e3273b3a12b8f5edbdf37f43b805eb28fb56738076c09
checksum/config: 935fc1e7c80cf17a292d54be11497c3b08c4a368110b028684628b90fc381fb6
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-k8s-cluster-receiver
Expand All @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 5c603eed4ee1801dda64837981fcfae38522fc0db4321b80e664df5f4d03b6a2
checksum/config: f07298aeeaf0f41911b5af992fc7e6c344a53aa52b68123d0e5f98f9deb51455
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
type: Opaque
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-collector-agent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
data:
Expand Down Expand Up @@ -253,7 +253,6 @@ data:
endpoint: 0.0.0.0:8006
hostmetrics:
collection_interval: 10s
root_path: /hostfs
scrapers:
cpu: null
disk: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
spec:
Expand All @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 9ecf5749d19f89689f9be61d6d03dce579874778c292abfccc0a59dc89581276
checksum/config: f5b6e87e3d60a906c57ccc755f6fa6244b6474a892cf9a3e3251ba5422d5ac88
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-k8s-cluster-receiver
Expand All @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 5c603eed4ee1801dda64837981fcfae38522fc0db4321b80e664df5f4d03b6a2
checksum/config: f07298aeeaf0f41911b5af992fc7e6c344a53aa52b68123d0e5f98f9deb51455
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
type: Opaque
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
component: otel-collector-agent
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-collector-agent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ metadata:
namespace: default
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.112.0
helm.sh/chart: splunk-otel-collector-0.112.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.112.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.112.0
chart: splunk-otel-collector-0.112.1
release: default
heritage: Helm
rules:
Expand Down
Loading

0 comments on commit d8af057

Please sign in to comment.