Merge branch 'main' into ym/cloudql_connections

porter-dev · Aug 1, 2024 · 848d2f9 · 848d2f9
2 parents 3adaf76 + 69d37ef
commit 848d2f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/addons/datadog/values.yaml b/addons/datadog/values.yaml
@@ -796,7 +796,7 @@ datadog:
   # Autodiscovery, as a space-sepatered list
 
   ## ref: https://docs.datadoghq.com/agent/guide/autodiscovery-management/?tab=containerizedagent#exclude-containers
-  containerExclude: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system'
+  containerExclude: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
 
   # datadog.containerInclude -- Include containers in the Agent Autodiscovery,
   # as a space-separated list.  If a container matches an include rule, it’s
@@ -807,15 +807,15 @@ datadog:
 
   # datadog.containerExcludeLogs -- Exclude logs from the Agent Autodiscovery,
   # as a space-separated list
-  containerExcludeLogs: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system'
+  containerExcludeLogs: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
 
   # datadog.containerIncludeLogs -- Include logs in the Agent Autodiscovery, as
   # a space-separated list
   containerIncludeLogs: null
 
   # datadog.containerExcludeMetrics -- Exclude metrics from the Agent
   # Autodiscovery, as a space-separated list
-  containerExcludeMetrics: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system'
+  containerExcludeMetrics: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
 
   # datadog.containerIncludeMetrics -- Include metrics in the Agent
   # Autodiscovery, as a space-separated list

diff --git a/addons/porter-agent/Chart.yaml b/addons/porter-agent/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.38.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.3.8"
+appVersion: "3.3.10"
 dependencies:
   - name: "loki"
     repository: "https://chart-addons.getporter.dev"

diff --git a/addons/porter-agent/values.yaml b/addons/porter-agent/values.yaml
@@ -1,5 +1,5 @@
 agent:
-  image: "ghcr.io/porter-dev/releases/porter-agent:3.3.8"
+  image: "ghcr.io/porter-dev/releases/porter-agent:3.3.10"
   cfAccessToken: ""
   porterHost: "dashboard.porter.run"
   porterPort: "80"