Merge pull request #12 from lightstep/more-config-for-ta

Version bump, allow for more configuration for the TA

Author: jaronoff97

charts/kube-otel-stack/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kube-otel-stack
 description: Chart for sending Kubernetes metrics to Lightstep using the OpenTelemetry Operator.
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: 0.70.0
 dependencies:
 # cert manager must be manually installed because it has CRDs

charts/kube-otel-stack/templates/collector.yaml

@@ -21,8 +21,15 @@ spec:
     image: {{ $collector.targetallocator.image }}
     replicas: {{ $collector.targetallocator.replicas }}
     allocationStrategy: {{ $collector.targetallocator.allocationStrategy }}
+    {{- if $collector.targetallocator.filterStrategy }}
+    filterStrategy: {{ $collector.targetallocator.filterStrategy }}
+    {{- end }}
+    {{- if $collector.targetallocator.prometheusCR.enabled }}
     prometheusCR:
-      enabled: {{ $collector.targetallocator.prometheusCR.enabled }}
+      {{- with $collector.targetallocator.prometheusCR }}
+      {{- toYaml .  | nindent 6 }}
+      {{- end }}
+    {{- end }}
 {{- end }}
 {{- end }}
   env:

charts/kube-otel-stack/templates/servicemonitors.yaml

@@ -6,6 +6,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ $collectorName }}-collector
+  labels:
+{{ include "kube-otel-stack.labels" $ | indent 4 }}
 spec:
   endpoints:
   - path: /metrics
@@ -21,6 +23,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ $collectorName }}-targetallocator
+  labels:
+{{ include "kube-otel-stack.labels" $ | indent 4 }}
 spec:
   endpoints:
   - path: /metrics
@@ -38,6 +42,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Release.Name }}-operator
+  labels:
+{{ include "kube-otel-stack.labels" $ | indent 4 }}
 spec:
   endpoints:
   - path: /metrics