From 561dff0923d4880fb43c09b59a479ab8c7f2197c Mon Sep 17 00:00:00 2001 From: harshit-splunk <89519921+harshit-splunk@users.noreply.github.com> Date: Fri, 29 Apr 2022 16:58:45 +0530 Subject: [PATCH] 1.4.15 (#759) --- PLUGIN_VERSIONS.sh | 8 +- README.md | 4 +- VERSION | 2 +- docs/index.yaml | 65 +++++++++++--- docs/splunk-connect-for-kubernetes-1.4.15.tgz | Bin 0 -> 48274 bytes .../splunk-connect-for-kubernetes/Chart.yaml | 4 +- .../splunk-kubernetes-logging/Chart.yaml | 4 +- .../templates/configMap.yaml | 8 +- .../templates/daemonset.yaml | 6 ++ .../splunk-kubernetes-logging/values.yaml | 17 +++- .../splunk-kubernetes-metrics/Chart.yaml | 4 +- .../templates/configMap.yaml | 8 +- .../templates/configMapMetricsAggregator.yaml | 6 ++ .../templates/daemonset.yaml | 6 ++ .../deploymentMetricsAggregator.yaml | 6 ++ .../splunk-kubernetes-metrics/values.yaml | 10 ++- .../splunk-kubernetes-objects/Chart.yaml | 4 +- .../templates/configMap.yaml | 3 + .../templates/deployment.yaml | 6 ++ .../splunk-kubernetes-objects/values.yaml | 5 +- .../requirements.yaml | 6 +- .../splunk-connect-for-kubernetes/values.yaml | 82 ++++++++++++------ .../clusterRole.yaml | 2 +- .../clusterRoleBinding.yaml | 2 +- .../splunk-kubernetes-logging/configMap.yaml | 12 ++- .../splunk-kubernetes-logging/daemonset.yaml | 6 +- .../podSecurityPolicy.yaml | 2 +- .../splunk-kubernetes-logging/secret.yaml | 2 +- .../service-headless.yaml | 2 +- .../serviceAccount.yaml | 2 +- .../clusterRole.yaml | 2 +- .../clusterRoleAggregator.yaml | 2 +- .../clusterRoleBinding.yaml | 2 +- .../clusterRoleBindingAggregator.yaml | 2 +- .../splunk-kubernetes-metrics/configMap.yaml | 4 +- .../configMapMetricsAggregator.yaml | 4 +- .../splunk-kubernetes-metrics/daemonset.yaml | 6 +- .../deploymentMetricsAggregator.yaml | 6 +- .../podSecurityPolicy.yaml | 2 +- .../podSecurityPolicyAggregator.yaml | 2 +- .../splunk-kubernetes-metrics/secret.yaml | 2 +- .../serviceAccount.yaml | 2 +- .../clusterRole.yaml | 2 +- .../clusterRoleBinding.yaml | 2 +- .../splunk-kubernetes-objects/configMap.yaml | 4 +- .../splunk-kubernetes-objects/deployment.yaml | 6 +- .../podSecurityPolicy.yaml | 2 +- .../splunk-kubernetes-objects/secret.yaml | 2 +- .../serviceAccount.yaml | 2 +- 49 files changed, 245 insertions(+), 105 deletions(-) create mode 100644 docs/splunk-connect-for-kubernetes-1.4.15.tgz diff --git a/PLUGIN_VERSIONS.sh b/PLUGIN_VERSIONS.sh index 90d27343..a1fa2b2b 100755 --- a/PLUGIN_VERSIONS.sh +++ b/PLUGIN_VERSIONS.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -FLUENTD_HEC_VERSION=1.2.12 -K8S_METRICS_VERISION=1.1.11 -K8S_METRICS_AGGR_VERSION=1.1.11 -KUBE_OBJECT_VERSION=1.1.11 +FLUENTD_HEC_VERSION=1.2.13 +K8S_METRICS_VERISION=1.1.12 +K8S_METRICS_AGGR_VERSION=1.1.12 +KUBE_OBJECT_VERSION=1.1.12 diff --git a/README.md b/README.md index 9881f093..8e5f4da2 100644 --- a/README.md +++ b/README.md @@ -62,11 +62,11 @@ helm show values splunk/splunk-connect-for-kubernetes > values.yaml Helm 2 ```bash -helm install --name my-splunk-connect -f my_values.yaml splunk/splunk-connect-for-kubernetes +helm install --name my-splunk-connect -f values.yaml splunk/splunk-connect-for-kubernetes ``` Helm 3 ```bash -helm install my-splunk-connect -f my_values.yaml splunk/splunk-connect-for-kubernetes +helm install my-splunk-connect -f values.yaml splunk/splunk-connect-for-kubernetes ``` diff --git a/VERSION b/VERSION index 144cbab5..976182be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.14 \ No newline at end of file +1.4.15 \ No newline at end of file diff --git a/docs/index.yaml b/docs/index.yaml index ad0286b7..8888353d 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -1,9 +1,48 @@ apiVersion: v1 entries: splunk-connect-for-kubernetes: + - apiVersion: v1 + appVersion: 1.4.15 + created: "2022-04-29T15:32:19.048979+05:30" + dependencies: + - condition: splunk-kubernetes-logging.enabled + name: splunk-kubernetes-logging + repository: https://splunk.github.io/splunk-connect-for-kubernetes/ + version: 1.4.15 + - condition: splunk-kubernetes-objects.enabled + name: splunk-kubernetes-objects + repository: https://splunk.github.io/splunk-connect-for-kubernetes/ + version: 1.4.15 + - condition: splunk-kubernetes-metrics.enabled + name: splunk-kubernetes-metrics + repository: https://splunk.github.io/splunk-connect-for-kubernetes/ + version: 1.4.15 + description: Collect logs, objects (metadata), and metrics with Splunk. + digest: afd67f2fb093a553eaec04f1f5eb2ae386caca97064c8eab1e9e64303a5f0807 + home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart + keywords: + - splunk + - monitoring + - logging + - metrics + - metadata + - objects + maintainers: + - email: DataEdge@splunk.com + name: Splunk Inc. + name: splunk-connect-for-kubernetes + sources: + - https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart + - https://github.com/splunk/fluent-plugin-splunk-hec + - https://github.com/splunk/fluent-plugin-kubernetes-metrics + - https://github.com/splunk/fluent-plugin-k8s-metrics-agg + - https://github.com/splunk/fluent-plugin-kubernetes-objects + urls: + - splunk-connect-for-kubernetes-1.4.15.tgz + version: 1.4.15 - apiVersion: v1 appVersion: 1.4.14 - created: "2022-03-29T16:41:03.314913+05:30" + created: "2022-04-29T15:32:19.042004+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -42,7 +81,7 @@ entries: version: 1.4.14 - apiVersion: v1 appVersion: 1.4.13 - created: "2022-03-29T16:41:03.304015+05:30" + created: "2022-04-29T15:32:19.036166+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -81,7 +120,7 @@ entries: version: 1.4.13 - apiVersion: v1 appVersion: 1.4.12 - created: "2022-03-29T16:41:03.292436+05:30" + created: "2022-04-29T15:32:19.028495+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -120,7 +159,7 @@ entries: version: 1.4.12 - apiVersion: v1 appVersion: 1.4.11 - created: "2022-03-29T16:41:03.28241+05:30" + created: "2022-04-29T15:32:19.021086+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -159,7 +198,7 @@ entries: version: 1.4.11 - apiVersion: v1 appVersion: 1.4.10 - created: "2022-03-29T16:41:03.269686+05:30" + created: "2022-04-29T15:32:19.011303+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -198,7 +237,7 @@ entries: version: 1.4.10 - apiVersion: v1 appVersion: 1.4.9 - created: "2022-03-29T16:41:03.360415+05:30" + created: "2022-04-29T15:32:19.091094+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -237,7 +276,7 @@ entries: version: 1.4.9 - apiVersion: v1 appVersion: 1.4.8 - created: "2022-03-29T16:41:03.354519+05:30" + created: "2022-04-29T15:32:19.085369+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -276,7 +315,7 @@ entries: version: 1.4.8 - apiVersion: v1 appVersion: 1.4.7 - created: "2022-03-29T16:41:03.348956+05:30" + created: "2022-04-29T15:32:19.080154+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -315,7 +354,7 @@ entries: version: 1.4.7 - apiVersion: v1 appVersion: 1.4.6 - created: "2022-03-29T16:41:03.343848+05:30" + created: "2022-04-29T15:32:19.074159+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -354,7 +393,7 @@ entries: version: 1.4.6 - apiVersion: v1 appVersion: 1.4.5 - created: "2022-03-29T16:41:03.337933+05:30" + created: "2022-04-29T15:32:19.067809+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -393,7 +432,7 @@ entries: version: 1.4.5 - apiVersion: v1 appVersion: 1.4.4 - created: "2022-03-29T16:41:03.331679+05:30" + created: "2022-04-29T15:32:19.061272+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -432,7 +471,7 @@ entries: version: 1.4.4 - apiVersion: v1 appVersion: 1.4.3 - created: "2022-03-29T16:41:03.324374+05:30" + created: "2022-04-29T15:32:19.054386+05:30" dependencies: - condition: splunk-kubernetes-logging.enabled name: splunk-kubernetes-logging @@ -469,4 +508,4 @@ entries: urls: - splunk-connect-for-kubernetes-1.4.3.tgz version: 1.4.3 -generated: "2022-03-29T16:41:03.258751+05:30" +generated: "2022-04-29T15:32:19.00179+05:30" diff --git a/docs/splunk-connect-for-kubernetes-1.4.15.tgz b/docs/splunk-connect-for-kubernetes-1.4.15.tgz new file mode 100644 index 0000000000000000000000000000000000000000..27df24844530361cd0fbcc45839f9d6bb6a40996 GIT binary patch literal 48274 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 + output.conf: |- #Events are emitted to the CONCAT label from the container, file and journald sources for multiline processing. @@ -370,6 +373,9 @@ data: {{- with or .Values.splunk.hec.host .Values.global.splunk.hec.host }} hec_host {{ . | quote }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl}} full_url {{ . | quote }} {{- end }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml index 7ffcc1c9..9c6a3239 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml @@ -8,6 +8,9 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} engine: fluentd + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 4 }} + {{- end }} spec: updateStrategy: type: RollingUpdate @@ -20,6 +23,9 @@ spec: labels: app: {{ template "splunk-kubernetes-logging.name" . }} release: {{ .Release.Name }} + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }} {{- if .Values.global.prometheus_enabled }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml index 0f027a1e..42425bf1 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml @@ -172,6 +172,7 @@ charEncodingUtf8: false # firstline: "" # flushInterval 5 # sourcetype: "" +# limitRecentlyModified: # ``` # # = = @@ -223,6 +224,17 @@ charEncodingUtf8: false # sourcetype of each kind of log can be defined using the `sourcetype` field. # If `sourcetype` is not defined, `name` will be used. # +# = limitRecentlyModified = +# Limits the watching files that the modification time is within the specified time period when using * in path. +# - s: seconds +# - m: minutes +# - h: hours +# - d: days +# - Otherwise, the field is parsed as float, and that float is the number of seconds +# Example, specifying `limitRecentlyModified: 24h` will parse only files with modification time within 24 hours. +# Files modified earlier will be skipped. +# If `limitRecentlyModified` is not defined, this option will be disabled. +# # --- # Here we have some default timestampExtraction and multiline settings for kubernetes components. # So, usually you just need to redefine the source of those components if necessary. @@ -313,7 +325,7 @@ image: # The name of the image to pull name: splunk/fluentd-hec # The tag of the image to pull - tag: 1.2.12 + tag: 1.2.13 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -327,6 +339,9 @@ environmentVar: # Pod annotations for daemonset podAnnotations: +# Extra labels for daemonset, pods +extraLabels: + # Controls the resources used by the fluentd daemonset resources: # limits: diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/Chart.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/Chart.yaml index 0b955a24..b2ad6bd4 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/Chart.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -version: 1.4.14 -appVersion: 1.4.14 +version: 1.4.15 +appVersion: 1.4.15 name: splunk-kubernetes-metrics description: Collect metrics with Splunk. home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart/charts/splunk-kubernetes-metrics diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml index 6685f838..55b4b42d 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml @@ -131,6 +131,9 @@ data: {{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }} hec_port {{ . }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl }} full_url {{ . | quote }} {{- end }} @@ -172,6 +175,9 @@ data: {{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }} hec_port {{ . }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl }} full_url {{ . | quote }} {{- end }} @@ -214,4 +220,4 @@ data: @type json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml index d47d66be..20b6aae7 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml @@ -123,6 +123,9 @@ data: {{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }} hec_port {{ . }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl }} full_url {{ . | quote }} {{- end }} @@ -164,6 +167,9 @@ data: {{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }} hec_port {{ . }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl }} full_url {{ . | quote }} {{- end }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml index 19847e4f..5ffbb8d3 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml @@ -9,6 +9,9 @@ metadata: heritage: {{ .Release.Service }} component: collector engine: fluentd + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 4 }} + {{- end }} spec: updateStrategy: type: RollingUpdate @@ -27,6 +30,9 @@ spec: heritage: {{ .Release.Service }} component: collector engine: fluentd + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 8 }} + {{- end }} annotations: scheduler.alpha.kubernetes.io/critical-pod: '' checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml index 7cc2c52e..a8e1425f 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml @@ -8,6 +8,9 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} component: aggregator + {{- if .Values.extraLabelsAgg }} +{{ toYaml .Values.extraLabelsAgg | indent 4 }} + {{- end }} spec: strategy: type: RollingUpdate @@ -24,6 +27,9 @@ spec: chart: {{ template "splunk-kubernetes-metrics.chart" . }} release: {{ .Release.Name }} component: aggregator + {{- if .Values.extraLabelsAgg }} +{{ toYaml .Values.extraLabelsAgg | indent 8 }} + {{- end }} annotations: scheduler.alpha.kubernetes.io/critical-pod: '' checksum/config: {{ include (print $.Template.BasePath "/configMapMetricsAggregator.yaml") . | sha256sum }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml index 4e2fc24a..8b2253b8 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml @@ -92,7 +92,7 @@ image: # The name of the image to pull name: splunk/k8s-metrics # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -107,7 +107,7 @@ imageAgg: # The name of the image to pull name: splunk/k8s-metrics-aggr # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -127,6 +127,12 @@ podAnnotations: # Pod annotations for metrics aggregator pod podAnnotationsAgg: +# Extra labels for metrics daemonset, pods +extraLabels: + +# Extra labels for metrics aggregator deployment, pods +extraLabelsAgg: + # Controls the resources used by the fluentd daemonset resources: fluent: diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/Chart.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/Chart.yaml index c9491764..43578227 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/Chart.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -version: 1.4.14 -appVersion: 1.4.14 +version: 1.4.15 +appVersion: 1.4.15 name: splunk-kubernetes-objects description: Collect Kubernetes objects with Splunk. home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart/charts/splunk-kubernetes-objects diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml index 6bdefb7a..73f348ef 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml @@ -125,6 +125,9 @@ data: {{- with or .Values.splunk.hec.port .Values.global.splunk.hec.port }} hec_port {{ . }} {{- end }} + {{- with or .Values.splunk.hec.endpoint .Values.global.splunk.hec.endpoint }} + hec_endpoint {{ . | quote }} + {{- end }} {{- with or .Values.splunk.hec.fullUrl .Values.global.splunk.hec.fullUrl }} full_url {{ . | quote }} {{- end }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml index 7b6b6558..c73dbc14 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml @@ -7,6 +7,9 @@ metadata: chart: {{ template "splunk-kubernetes-objects.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 4 }} + {{- end }} spec: strategy: type: RollingUpdate @@ -22,6 +25,9 @@ spec: app: {{ template "splunk-kubernetes-objects.name" . }} release: {{ .Release.Name }} engine: fluentd + {{- if .Values.extraLabels }} +{{ toYaml .Values.extraLabels | indent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }} {{- if .Values.podAnnotations }} diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml index 87d47096..5687061a 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml @@ -200,7 +200,7 @@ image: # The name of the image to pull name: splunk/kube-objects # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -214,6 +214,9 @@ environmentVar: # Pod annotations for object pod podAnnotations: +# Extra labels for object deployment, pods +extraLabels: + # = Resoruce Limitation Configs = resources: # limits: diff --git a/helm-chart/splunk-connect-for-kubernetes/requirements.yaml b/helm-chart/splunk-connect-for-kubernetes/requirements.yaml index 26ff4daa..5587e969 100644 --- a/helm-chart/splunk-connect-for-kubernetes/requirements.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/requirements.yaml @@ -1,13 +1,13 @@ dependencies: - name: splunk-kubernetes-logging - version: 1.4.14 + version: 1.4.15 repository: https://splunk.github.io/splunk-connect-for-kubernetes/ condition: splunk-kubernetes-logging.enabled - name: splunk-kubernetes-objects - version: 1.4.14 + version: 1.4.15 repository: https://splunk.github.io/splunk-connect-for-kubernetes/ condition: splunk-kubernetes-objects.enabled - name: splunk-kubernetes-metrics - version: 1.4.14 + version: 1.4.15 repository: https://splunk.github.io/splunk-connect-for-kubernetes/ condition: splunk-kubernetes-metrics.enabled diff --git a/helm-chart/splunk-connect-for-kubernetes/values.yaml b/helm-chart/splunk-connect-for-kubernetes/values.yaml index 32454740..298f7c54 100644 --- a/helm-chart/splunk-connect-for-kubernetes/values.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/values.yaml @@ -19,6 +19,8 @@ global: # protocol has two options: "http" and "https", default is "https" # For self signed certificate leave this field blank protocol: + # Allow specifying the HEC endpoint to use, default is "/services/collector" + endpoint: # Instead of providing host, port, and protocol, you can provide full url for splunk. For example: https://mydomain.com:8088/apps/splunk fullUrl: # indexName tells which index to use, this is optional. If it's not present, will use "main". @@ -30,7 +32,7 @@ global: # NOTE: The content of the certificate itself should be used here, not the file path. # The certificate will be stored as a secret in kubernetes. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -48,7 +50,7 @@ global: # For object and metrics indexRouting: # Indicates if 4xx errors should consume chunk. If set to true, plugin will not retry sending chunk to splunk when 4xx error occurs. (Default: true) - consume_chunk_on_4xx_errors: + consume_chunk_on_4xx_errors: kubernetes: # The cluster name used to tag logs. Default is cluster_name clusterName: "cluster_name" @@ -101,7 +103,7 @@ splunk-kubernetes-logging: # Log format type, "json" or "cri" logFormatType: json # Specify the logFormat for "cri" logFormatType - provide time format - # For example "%Y-%m-%dT%H:%M:%S.%N%:z" for openshift, "%Y-%m-%dT%H:%M:%S.%NZ" for IBM IKS + # For example "%Y-%m-%dT%H:%M:%S.%N%:z" for openshift, "%Y-%m-%dT%H:%M:%S.%NZ" for IBM IKS # Default for "cri": "%Y-%m-%dT%H:%M:%S.%N%:z" # For "json", the log format cannot be changed: "%Y-%m-%dT%H:%M:%S.%NZ" logFormat: @@ -123,7 +125,7 @@ splunk-kubernetes-logging: cache_ttl: 3600 sourcetypePrefix: "kube" - + rbac: # Specifies whether RBAC resources should be created. # This should be set to `false` if either: @@ -171,7 +173,9 @@ splunk-kubernetes-logging: # protocol has two options: "http" and "https", default is "https" # For self signed certificate leave this field blank protocol: - # Instead of providing host, port, and protocol, you can provide full url for splunk. For example: https://mydomain.com:8088/apps/splunk + # Allow specifying the HEC endpoint to use, default is "/services/collector" + endpoint: + # Instead of providing host, port, and protocol, you can provide full url for splunk. For example: https://mydomain.com:8088/apps/splunk fullUrl: # indexName tells which index to use, this is optional. If it's not present, will use "main". indexName: @@ -182,7 +186,7 @@ splunk-kubernetes-logging: # NOTE: The content of the certificate itself should be used here, not the file path. # The certificate will be stored as a secret in kubernetes. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -197,7 +201,7 @@ splunk-kubernetes-logging: # The file will be stored as a secret in kubernetes. caFile: # Indicates if 4xx errors should consume chunk. If set to true, plugin will not retry sending chunk to splunk when 4xx error occurs. (Default: true) - consume_chunk_on_4xx_errors: + consume_chunk_on_4xx_errors: # Configurations for Ingest API ingest_api: # serviceClientIdentifier is a string, the client identifier is used to make requests to the ingest API with authorization. @@ -247,6 +251,7 @@ splunk-kubernetes-logging: # firstline: "" # flushInterval 5 # sourcetype: "" + # limitRecentlyModified: # ``` # # = = @@ -298,6 +303,17 @@ splunk-kubernetes-logging: # sourcetype of each kind of log can be defined using the `sourcetype` field. # If `sourcetype` is not defined, `name` will be used. # + # = limitRecentlyModified = + # Limits the watching files that the modification time is within the specified time period when using * in path. + # - s: seconds + # - m: minutes + # - h: hours + # - d: days + # - Otherwise, the field is parsed as float, and that float is the number of seconds + # Example, specifying `limitRecentlyModified: 24h` will parse only files with modification time within 24 hours. + # Files modified earlier will be skipped. + # If `limitRecentlyModified` is not defined, this option will be disabled. + # # --- # Here we have some default timestampExtraction and multiline settings for kubernetes components. # So, usually you just need to redefine the source of those components if necessary. @@ -388,7 +404,7 @@ splunk-kubernetes-logging: # The name of the image to pull name: splunk/fluentd-hec # The tag of the image to pull - tag: 1.2.12 + tag: 1.2.13 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -399,9 +415,12 @@ splunk-kubernetes-logging: # Environment variable for daemonset environmentVar: - # Pod annotations for object pod + # Pod annotations for logging pod podAnnotations: + # Extra labels for logging daemonset, pods + extraLabels: + # Controls the resources used by the fluentd daemonset resources: # limits: @@ -583,7 +602,7 @@ splunk-kubernetes-objects: insecureSSL: false # Path to the certificate file for this client. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -695,7 +714,7 @@ splunk-kubernetes-objects: insecureSSL: # The *content* of a PEM-format CA certificate for this client. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -717,7 +736,7 @@ splunk-kubernetes-objects: # body: jq '.record.index = "my_awesome_index" | .record' indexRouting: # Indicates if 4xx errors should consume chunk. If set to true, plugin will not retry sending chunk to splunk when 4xx error occurs. (Default: true) - consume_chunk_on_4xx_errors: + consume_chunk_on_4xx_errors: # Create or use existing secret if name is empty default name is used secret: @@ -731,7 +750,7 @@ splunk-kubernetes-objects: # The name of the image to pull name: splunk/kube-objects # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -739,11 +758,14 @@ splunk-kubernetes-objects: # The name of the pull secret to attach to the respective serviceaccount used to pull the image pullSecretName: - # Environment variable for metrics daemonset + # Environment variable for objects daemonset environmentVar: - # Pod annotations for metrics daemonset - podAnnotations: + # Pod annotations for objects daemonset + podAnnotations: + + # Extra labels for objects daemonset, pods + extraLabels: # = Resource Limitation Configs = resources: @@ -907,7 +929,7 @@ splunk-kubernetes-metrics: # NOTE: The content of the certificate itself should be used here, not the file path. # The certificate will be stored as a secret in kubernetes. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -922,7 +944,7 @@ splunk-kubernetes-metrics: # The file will be stored as a secret in kubernetes. caFile: # Indicates if 4xx errors should consume chunk. If set to true, plugin will not retry sending chunk to splunk when 4xx error occurs. (Default: true) - consume_chunk_on_4xx_errors: + consume_chunk_on_4xx_errors: # Create or use existing secret if name is empty default name is used secret: @@ -936,7 +958,7 @@ splunk-kubernetes-metrics: # The name of the image to pull name: splunk/k8s-metrics # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -951,7 +973,7 @@ splunk-kubernetes-metrics: # The name of the image to pull name: splunk/k8s-metrics-aggr # The tag of the image to pull - tag: 1.1.11 + tag: 1.1.12 # The policy that specifies when the user wants the images to be pulled pullPolicy: IfNotPresent # Indicates if the image should be pulled using authentication from a secret @@ -964,12 +986,18 @@ splunk-kubernetes-metrics: # Environment variable for metrics aggregator pod environmentVarAgg: - + # Pod annotations for metrics daemonset - podAnnotations: + podAnnotations: # Pod annotations for metrics aggregator pod - podAnnotationsAgg: + podAnnotationsAgg: + + # Extra labels for metrics aggregator daemonset, pods + extraLabels: + + # Extra labels for metrics aggregator deployment, pods + extraLabelsAgg: # Controls the resources used by the fluentd daemonset resources: @@ -1030,10 +1058,10 @@ splunk-kubernetes-metrics: aggregatorTolerations: {} # Defines priorityClassName to assign a priority class to metrics (daemonset) pods. - priorityClassName: + priorityClassName: # Defines priorityClassName to assign a priority class to metrics aggregetor (deployment) pods. - priorityClassNameAgg: + priorityClassNameAgg: # Defines node affinity to restrict pod deployment. @@ -1054,7 +1082,7 @@ splunk-kubernetes-metrics: insecureSSL: false # Path to the CA file. # Make sure you are providing the certificate as multiline string (use `|-`) - # Example: + # Example: # caFile: |- # -----BEGIN CERTIFICATE----- # ... @@ -1134,5 +1162,5 @@ splunk-kubernetes-metrics: # body: | # # cluster_name "my_awesome_cluster" - # + # customFiltersAggr: {} diff --git a/manifests/splunk-kubernetes-logging/clusterRole.yaml b/manifests/splunk-kubernetes-logging/clusterRole.yaml index 8e272ba7..5c95bf3b 100644 --- a/manifests/splunk-kubernetes-logging/clusterRole.yaml +++ b/manifests/splunk-kubernetes-logging/clusterRole.yaml @@ -5,7 +5,7 @@ metadata: name: splunk-kubernetes-logging labels: app: splunk-kubernetes-logging - version: 1.4.14 + version: 1.4.15 rules: - apiGroups: - policy diff --git a/manifests/splunk-kubernetes-logging/clusterRoleBinding.yaml b/manifests/splunk-kubernetes-logging/clusterRoleBinding.yaml index ef995a21..c5d63255 100644 --- a/manifests/splunk-kubernetes-logging/clusterRoleBinding.yaml +++ b/manifests/splunk-kubernetes-logging/clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: name: splunk-kubernetes-logging labels: app: splunk-kubernetes-logging - version: 1.4.14 + version: 1.4.15 roleRef: kind: ClusterRole name: splunk-kubernetes-logging diff --git a/manifests/splunk-kubernetes-logging/configMap.yaml b/manifests/splunk-kubernetes-logging/configMap.yaml index 341d06c2..3eb117c3 100644 --- a/manifests/splunk-kubernetes-logging/configMap.yaml +++ b/manifests/splunk-kubernetes-logging/configMap.yaml @@ -5,7 +5,7 @@ metadata: name: splunk-kubernetes-logging labels: app: splunk-kubernetes-logging - version: 1.4.14 + version: 1.4.15 data: fluent.conf: |- @include system.conf @@ -113,8 +113,12 @@ data: field_map_strict true - monit.conf: "\n @id fluentd-monitor-agent\n @type monitor_agent\n @label - @PARSE\n " + monit.conf: |- + + @id fluentd-monitor-agent + @type monitor_agent + @label @PARSE + output.conf: |- #Events are emitted to the CONCAT label from the container, file and journald sources for multiline processing.