splunk · hvaghani221 · Apr 29, 2022 · Nov 17, 2021 · Nov 30, 2021 · Nov 30, 2021
diff --git 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
@@ -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
@@ -1 +1 @@
-1.4.14
+1.4.15
diff --git 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: [email protected]
+      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
diff --git 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
@@ -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/...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml b/...t/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 }}
-    </source>  
+    </source>
 
   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/...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml b/...t/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
@@ -172,6 +172,7 @@ charEncodingUtf8: false
 #     firstline: "<regexp_to_detect_firstline_of_multiline>"
 #     flushInterval 5
 #   sourcetype: "<sourcetype_of_logs>"
+#   limitRecentlyModified: <time_duration>
 # ```
 #
 # = <source> =
@@ -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.
+# - <INTEGER>s: seconds
+# - <INTEGER>m: minutes
+# - <INTEGER>h: hours
+# - <INTEGER>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
@@ -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/...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml b/...t/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
       </format>
     </match>
-    {{- end }}
+    {{- end }}
diff --git a/...for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml b/...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/...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml b/...t/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/...or-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml b/...or-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 }}