Merge Header

.drone/pipelines/build_images.jsonnet

@@ -32,7 +32,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.9-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
       ],
     }],
     volumes: [{
@@ -55,7 +55,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.9-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
       ],
     }],
     volumes: [{

.github/workflows/check-linux-build-image.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   check-linux-build-image:
-    runs-on: ubuntu-latest
+    runs-on: github-hosted-ubuntu-x64-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
           push: false
           tags: grafana/agent-build-image:latest
           build-args: |
-            GO_RUNTIME=golang:1.22.5-bullseye
+            GO_RUNTIME=golang:1.22.9-bullseye
 
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v6
@@ -34,4 +34,4 @@ jobs:
           push: false
           tags: grafana/agent-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.9-bullseye

.github/workflows/integration-tests.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 jobs:
   run_tests:
-    runs-on: ubuntu-latest
+    runs-on: github-hosted-ubuntu-x64-large
     steps:
     - name: Checkout code
       uses: actions/checkout@v4

CHANGELOG.md

@@ -7,6 +7,7 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+
 v0.43.4 (2024-11-25)
 -----------------
 

build-image/windows/Dockerfile

@@ -1,4 +1,4 @@
-FROM library/golang:1.22.5-windowsservercore-1809
+FROM library/golang:1.22.9-windowsservercore-1809
 
 SHELL ["powershell", "-command"]
 

docs/developer/release/3-update-version-in-code.md

@@ -36,7 +36,7 @@ The project must be updated to reference the upcoming release tag whenever a new
 
 3. Create a PR to merge to main (must be merged before continuing).
 
-    - Release Candidate example PR [here](https://github.com/grafana/agent/pull/3065)
+    - Release Candidate example PR [here](https://github.com/grafana/agent/pull/6987)
     - Stable Release example PR [here](https://github.com/grafana/agent/pull/6993)
     - Patch Release example PR [here](https://github.com/grafana/agent/pull/6944)
 
@@ -52,7 +52,7 @@ The project must be updated to reference the upcoming release tag whenever a new
 
 6. Create a PR to merge to `release-VERSION_PREFIX` (must be merged before continuing).
 
-    - Release Candidate example PR [here](https://github.com/grafana/agent/pull/3066)
+    - Release Candidate example PR [here](https://github.com/grafana/agent/pull/6988)
     - Stable Release example PR [here](https://github.com/grafana/agent/pull/6994)
     - Patch Release example PR [here](https://github.com/grafana/agent/pull/6945)
         - This PR takes a shortcut by both changing the version and cherry-picking other required changes on the release branch.

docs/sources/_index.md

@@ -9,7 +9,7 @@ title: Grafana Agent
 description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector
 weight: 350
 cascade:
-  AGENT_RELEASE: v0.43.3
+  AGENT_RELEASE: v0.43.4
   OTEL_VERSION: v0.96.0
 refs:
   variants:

docs/sources/flow/reference/components/prometheus.exporter.windows.md

@@ -172,14 +172,19 @@ For a server name to be included, it must match the regular expression specified
 
 ### service block
 
-Name           | Type     | Description                                           | Default | Required
----------------|----------|-------------------------------------------------------|---------|---------
-`use_api`      | `string` | Use API calls to collect service data instead of WMI. | `false` | no
-`where_clause` | `string` | WQL 'where' clause to use in WMI metrics query.       | `""`    | no
+Name           | Type     | Description                                                 | Default | Required
+---------------|----------|-------------------------------------------------------------|---------|---------
+`use_api`      | `string` | Use the Windows API to collect service data instead of WMI. | `false` | no
+`where_clause` | `string` | WQL 'where' clause to use in WMI metrics query.             | `""`    | no
 
 The `where_clause` argument can be used to limit the response to the services you specify, reducing the size of the response.
 If `use_api` is enabled, 'where_clause' won't be effective.
 
+The Windows API is more performant than WMI. Set `use_api` to `true` in situations when the WMI takes too long to get the service information.
+Setting `use_api` to `true` does have a few disadvantages compared to using WMI:
+* WMI queries in `where_clause` won't work.
+* The `status` field of the service is not available. You can use the `state` property to retrieve status information. This property provides the same information, but it is formatted differently.
+
 
 ### smtp block
 

docs/sources/static/configuration/integrations/windows-exporter-config.md

@@ -113,6 +113,15 @@ Full reference of options:
     # "WQL 'where' clause to use in WMI metrics query. Limits the response to the services you specify and reduces the size of the response.
     # Maps to collector.service.services-where in windows_exporter
     [where_clause: <string> | default=""]
+    # If "use_api" is set to "true", service data will be collected via the Windows API.
+    # If "use_api" is set to "false", service data will be collected via WMI.
+    # When "use_api" is set to "true", "where_clause" will be ignored and will not take effect.
+    # The Windows API is more performant than WMI. Set `use_api` to `true` in situations when the WMI takes too long to get the service information.
+    # Setting `use_api` to `true` does have a few disadvantages compared to using WMI:
+    # * WMI queries in `where_clause` won't work.
+    # * The `status` field of the service won't be reported. Instead, use the `state` property. 
+    #   It has the same information, albeit formatted differently.
+    [use_api: <boolean> | default = false]
 
   # Configuration for physical disk on Windows 
   physical_disk:

docs/sources/static/configuration/logs-config.md

@@ -18,7 +18,7 @@ configured, except deprecated fields have been removed and the server_config is
 not supported.
 
 Refer to the
-[Promtail documentation](/docs/loki/latest/clients/promtail/configuration/#clients)
+[Promtail documentation](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/)
 for the supported values for these fields.
 
 ```yaml
@@ -56,7 +56,7 @@ clients:
 > **Note:** More information on the following types can be found on the
 > documentation for Promtail:
 >
-> * [`promtail.client_config`](/docs/loki/latest/clients/promtail/configuration/#clients)
+> * [`promtail.client_config`](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#clients)
 
 
 ## file_watch_config
@@ -110,10 +110,10 @@ scrape_configs:
 > **Note:** More information on the following types can be found on the
 > documentation for Promtail:
 >
-> * [`promtail.client_config`](/docs/loki/latest/clients/promtail/configuration/#clients)
-> * [`promtail.scrape_config`](/docs/loki/latest/clients/promtail/configuration/#scrape_configs)
-> * [`promtail.target_config`](/docs/loki/latest/clients/promtail/configuration/#target_config)
-> * [`promtail.limits_config`](/docs/loki/latest/clients/promtail/configuration/#limits_config)
+> * [`promtail.client_config`](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#clients)
+> * [`promtail.scrape_config`](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#scrape_configs)
+> * [`promtail.target_config`](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#target_config)
+> * [`promtail.limits_config`](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#limits_config)
 
 > **Note:** Backticks in values are not supported.
 

go.mod

@@ -370,7 +370,7 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/status v1.1.1 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect

go.sum

@@ -857,8 +857,9 @@ github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
 github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
+github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=

internal/web/ui/yarn.lock

@@ -8473,9 +8473,9 @@ rollup-plugin-terser@^7.0.0:
     terser "^5.0.0"
 
 rollup@^2.43.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.79.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
   optionalDependencies:
     fsevents "~2.3.2"
 

operations/helm/charts/grafana-agent/CHANGELOG.md

@@ -7,6 +7,27 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+0.43.3 (2024-09-26)
+----------
+
+### Enhancements
+
+- Update Grafana Agent version to v0.43.3. (@wildum)
+
+0.43.2 (2024-09-25)
+----------
+
+### Enhancements
+
+- Update Grafana Agent version to v0.43.2. (@wildum)
+
+0.43.0 (2024-09-11)
+----------
+
+### Enhancements
+
+- Update Grafana Agent version to v0.43.0. (@ptodev)
+
 0.42.0 (2024-07-24)
 ----------
 

operations/helm/charts/grafana-agent/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: grafana-agent
 description: 'Grafana Agent'
 type: application
-version: 0.42.0
-appVersion: 'v0.42.0'
+version: 0.43.3
+appVersion: 'v0.43.3'
 
 dependencies:
   - name: crds

operations/helm/charts/grafana-agent/README.md

@@ -1,6 +1,6 @@
 # Grafana Agent Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.42.0](https://img.shields.io/badge/Version-0.42.0-informational?style=flat-square) ![AppVersion: v0.42.0](https://img.shields.io/badge/AppVersion-v0.42.0-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.43.3](https://img.shields.io/badge/Version-0.43.3-informational?style=flat-square) ![AppVersion: v0.43.3](https://img.shields.io/badge/AppVersion-v0.43.3-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Agent][] to Kubernetes.
 

operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml

@@ -30,7 +30,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml

@@ -28,7 +28,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml

@@ -29,7 +29,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml

@@ -30,7 +30,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run

operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.42.0
+          image: docker.io/grafana/agent:v0.43.3
           imagePullPolicy: IfNotPresent
           args:
             - run