better handling of the platform test and remove old template code.

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Nov 6, 2024 · bf39def · bf39def
1 parent 0b8be9d
commit bf39def
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/.github/workflows/platform-test.yml b/.github/workflows/platform-test.yml
@@ -42,6 +42,7 @@ jobs:
     name: Platform Test
     needs: list-tests
     runs-on: ubuntu-latest
+    if: ${{ needs.list-tests.outputs.tests != '[]' }}
     strategy:
       matrix:
         test: ${{ fromJson(needs.list-tests.outputs.tests) }}

diff --git a/charts/k8s-monitoring/templates/features/_feature_integrations.tpl b/charts/k8s-monitoring/templates/features/_feature_integrations.tpl
@@ -25,23 +25,6 @@
 {{- end }}
 {{- end }}
 
-<<<<<<< HEAD
-{{- define "features.integrations.logs.include" }}
-{{- $values := dict "Values" .Values.integrations "Files" $.Subcharts.integrations.Files "Release" $.Release }}
-{{- $destinations := include "features.integrations.destinations.logs" . | fromYamlArray }}
-{{- $integrations := include "feature.integrations.configured.logs" $values | fromYamlArray }}
-{{- range $integrationType := $integrations }}
-  {{- include (printf "integrations.%s.module.metrics" $integrationType) $values | indent 0 }}
-{{ include "helper.alloy_name" $integrationType }}_integration "integration" {
-  logs_destinations = [
-    {{ include "destinations.alloy.targets" (dict "destinations" $.Values.destinations "names" $destinations "type" "logs" "ecosystem" "loki") | indent 4 | trim }}
-  ]
-}
-{{- end }}
-{{- end }}
-
-=======
->>>>>>> 855eebe1 (Add log handling to the mysql integration)
 {{- define "features.integrations.include" }}
 {{- if eq .collectorName .Values.integrations.collector }}
   {{ include "features.integrations.metrics.include" . | indent 0 }}