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 00000000..27df2484 Binary files /dev/null and b/docs/splunk-connect-for-kubernetes-1.4.15.tgz differ diff --git a/helm-chart/splunk-connect-for-kubernetes/Chart.yaml b/helm-chart/splunk-connect-for-kubernetes/Chart.yaml index a6dd7b66..a74c493d 100644 --- a/helm-chart/splunk-connect-for-kubernetes/Chart.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: splunk-connect-for-kubernetes -version: 1.4.14 -appVersion: 1.4.14 +version: 1.4.15 +appVersion: 1.4.15 description: Collect logs, objects (metadata), and metrics with Splunk. home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart sources: diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/Chart.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/Chart.yaml index 852b0e8a..363011ad 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/Chart.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/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-logging description: Collect logs with Splunk. home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/main/helm-chart/charts/splunk-kubernetes-logging diff --git a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml index 50608905..cb13f149 100644 --- a/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml +++ b/helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml @@ -114,6 +114,9 @@ data: path {{ $logDef.from.file.path }} pos_file {{ $.Values.containers.path }}/splunk-fluentd-{{ $name }}.pos read_from_head true + {{- if $logDef.limitRecentlyModified }} + limit_recently_modified {{ $logDef.limitRecentlyModified }} + {{- end }} path_key source {{- if $logDef.multiline }} multiline_flush_interval {{ $logDef.multiline.flushInterval | default "5s" }} @@ -178,7 +181,7 @@ data: {{- if .Values.global.monitoring_agent_enabled }} tag monitor_agent {{- end }} - + 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.