Merge branch 'main' into docs/update-docs-tree-structure

.drone/pipelines/check_containers.jsonnet

@@ -3,13 +3,10 @@ local pipelines = import '../util/pipelines.jsonnet';
 
 local linux_containers = [
   { name: 'grafana/agent', make: 'make agent-image', path: 'cmd/grafana-agent/Dockerfile' },
-  { name: 'grafana/agentctl', make: 'make agentctl-image', path: 'cmd/grafana-agentctl/Dockerfile' },
-  { name: 'grafana/agent-operator', make: 'make operator-image', path: 'cmd/grafana-agent-operator/Dockerfile' },
 ];
 
 local windows_containers = [
   { name: 'grafana/agent', argument: 'agent', path: 'cmd/grafana-agent/Dockerfile.windows' },
-  { name: 'grafana/agentctl', argument: 'agentctl', path: 'cmd/grafana-agentctl/Dockerfile.windows' },
 ];
 
 (

.drone/pipelines/crosscompile.jsonnet

@@ -22,30 +22,35 @@ local os_arch_tuples = [
   // Windows
   { name: 'Windows amd64', os: 'windows', arch: 'amd64' },
 
+
   // FreeBSD
   { name: 'FreeBSD amd64', os: 'freebsd', arch: 'amd64' },
 ];
 
 
 local targets = [
   'agent',
-  'agent-flow',
-  'agentctl',
-  'operator',
 ];
 
 local targets_boringcrypto = [
   'agent-boringcrypto',
 ];
+local targets_boringcrypto_windows = [
+  'agent-windows-boringcrypto',
+];
+
 
 local os_arch_types_boringcrypto = [
   // Linux boringcrypto
   { name: 'Linux amd64 boringcrypto', os: 'linux', arch: 'amd64', experiment: 'boringcrypto' },
   { name: 'Linux arm64 boringcrypto', os: 'linux', arch: 'arm64', experiment: 'boringcrypto' },
 ];
+local windows_os_arch_types_boringcrypto = [
+  // Windows boringcrypto
+  { name: 'Windows amd64', os: 'windows', arch: 'amd64', experiment: 'cngcrypto' },
+];
 
-
-std.flatMap(function(target) (
+local build_environments(targets, tuples, image) = std.flatMap(function(target) (
   std.map(function(platform) (
     pipelines.linux('Build %s (%s)' % [target, platform.name]) {
       local env = {
@@ -56,47 +61,26 @@ std.flatMap(function(target) (
         target: target,
 
         tags: go_tags[platform.os],
-      },
+      } + (if 'experiment' in platform then { GOEXPERIMENT: platform.experiment } else {}),
 
       trigger: {
         event: ['pull_request'],
       },
-      steps: [{
-        name: 'Build',
-        image: build_image.linux,
-        commands: [
-          'make generate-ui',
-          'GO_TAGS="%(tags)s" GOOS=%(GOOS)s GOARCH=%(GOARCH)s GOARM=%(GOARM)s make %(target)s' % env,
-        ],
-      }],
-    }
-  ), os_arch_tuples)
-), targets) +
-std.flatMap(function(target) (
-  std.map(function(platform) (
-    pipelines.linux('Build %s (%s)' % [target, platform.name]) {
-      local env = {
-        GOOS: platform.os,
-        GOARCH: platform.arch,
-        GOARM: if 'arm' in platform then platform.arm else '',
-        GOEXPERIMENT: platform.experiment,
-
-        target: target,
-
-        tags: go_tags[platform.os],
-      },
 
-      trigger: {
-        event: ['pull_request'],
-      },
       steps: [{
         name: 'Build',
-        image: build_image.linux,
+        image: image,
         commands: [
           'make generate-ui',
-          'GO_TAGS="%(tags)s" GOOS=%(GOOS)s GOARCH=%(GOARCH)s GOARM=%(GOARM)s GOEXPERIMENT=%(GOEXPERIMENT)s make %(target)s' % env,
+          (if 'GOEXPERIMENT' in env
+           then 'GO_TAGS="%(tags)s" GOOS=%(GOOS)s GOARCH=%(GOARCH)s GOARM=%(GOARM)s GOEXPERIMENT=%(GOEXPERIMENT)s make %(target)s' % env
+           else 'GO_TAGS="%(tags)s" GOOS=%(GOOS)s GOARCH=%(GOARCH)s GOARM=%(GOARM)s make %(target)s') % env,
         ],
       }],
     }
-  ), os_arch_types_boringcrypto)
-), targets_boringcrypto)
+  ), tuples)
+), targets);
+
+build_environments(targets, os_arch_tuples, build_image.linux) +
+build_environments(targets_boringcrypto, os_arch_types_boringcrypto, build_image.linux) +
+build_environments(targets_boringcrypto_windows, windows_os_arch_types_boringcrypto, build_image.boringcrypto)

.drone/pipelines/publish.jsonnet

@@ -6,7 +6,7 @@ local ghTokenFilename = '/drone/src/gh-token.txt';
 // job_names gets the list of job names for use in depends_on.
 local job_names = function(jobs) std.map(function(job) job.name, jobs);
 
-local linux_containers = ['agent', 'agent-boringcrypto', 'agentctl', 'agent-operator'];
+local linux_containers = ['agent', 'agent-boringcrypto'];
 local linux_containers_jobs = std.map(function(container) (
   pipelines.linux('Publish Linux %s container' % container) {
     trigger: {
@@ -60,7 +60,7 @@ local linux_containers_jobs = std.map(function(container) (
   }
 ), linux_containers);
 
-local windows_containers = ['agent', 'agentctl'];
+local windows_containers = ['agent'];
 local windows_containers_jobs = std.map(function(container) (
   pipelines.windows('Publish Windows %s container' % container) {
     trigger: {

.drone/pipelines/test.jsonnet

@@ -16,40 +16,6 @@ local pipelines = import '../util/pipelines.jsonnet';
     }],
   },
 
-  pipelines.linux('Test dashboards') {
-    trigger: {
-      event: ['pull_request'],
-    },
-    steps: [{
-      name: 'Regenerate dashboards',
-      image: build_image.linux,
-
-      commands: [
-        'make generate-dashboards',
-        'ERR_MSG="Dashboard definitions are out of date. Please run \'make generate-dashboards\' and commit changes!"',
-        // "git status --porcelain" reports if there's any new, modified, or deleted files.
-        'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
-      ],
-    }],
-  },
-
-  pipelines.linux('Test crds') {
-    trigger: {
-      event: ['pull_request'],
-    },
-    steps: [{
-      name: 'Regenerate crds',
-      image: build_image.linux,
-
-      commands: [
-        'make generate-crds',
-        'ERR_MSG="Custom Resource Definitions are out of date. Please run \'make generate-crds\' and commit changes!"',
-        // "git status --porcelain" reports if there's any new, modified, or deleted files.
-        'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
-      ],
-    }],
-  },
-
   pipelines.linux('Test') {
     trigger: {
       event: ['pull_request'],

.drone/pipelines/test_packages.jsonnet

@@ -19,8 +19,6 @@ local pipelines = import '../util/pipelines.jsonnet';
       }],
       commands: [
         'DOCKER_OPTS="" make dist/grafana-agent-linux-amd64',
-        'DOCKER_OPTS="" make dist/grafana-agentctl-linux-amd64',
-        'DOCKER_OPTS="" make dist.temp/grafana-agent-flow-linux-amd64',
         'DOCKER_OPTS="" make test-packages',
       ],
     }],

CHANGELOG.md

@@ -17,6 +17,14 @@ Main (unreleased)
 
 - A new `loki.rules.kubernetes` component that discovers `PrometheusRule` Kubernetes resources and loads them into a Loki Ruler instance. (@EStork09)
 
+### Bugfixes
+
+- Fix an issues where the logging config block would trigger an error when trying to send logs to components that were not running. (@wildum)
+
+- Fix an issue where a custom component might be wired to a local declare instead of an import declare when they have the same label. (@wildum)
+
+- Fix an issue where flow mode panics if the `logging` config block is given a `null` Loki receiver to write log entries to. (@rfratto)
+
 v0.40.0 (2024-02-27)
 --------------------
 
@@ -51,6 +59,8 @@ v0.40.0 (2024-02-27)
 
 - Add `otelcol.connector.host_info` component to gather usage metrics for cloud users. (@rlankfo, @jcreixell)
 
+- Add Windows boringcrypto build and executable. (@mattdurham)
+
 ### Enhancements
 
 - Include line numbers in profiles produced by `pyrsocope.java` component. (@korniltsev)
@@ -127,6 +137,8 @@ v0.40.0 (2024-02-27)
 
 - Fix an issue where changing the configuration of `loki.write` would cause a panic. (@rfratto)
 
+- Fix issue where registry was not being properly deleted. (@mattdurham)
+
 ### Other changes
 
 - Removed support for Windows 2012 in line with Microsoft end of life. (@mattdurham)