Merge branch 'main' of github.com:grafana/alloy into secret-filter-fuzz-testing

Remove our CHANGELOG to avoid conflicts for the time being

Author: kelnage

.drone/drone.jsonnet

@@ -4,5 +4,4 @@ local pipelines = import './pipelines.jsonnet';
 (import 'pipelines/check_containers.jsonnet') +
 (import 'pipelines/crosscompile.jsonnet') +
 (import 'pipelines/publish.jsonnet') +
-(import 'pipelines/test_packages.jsonnet') +
 (import 'util/secrets.jsonnet').asList

.drone/drone.yml

@@ -287,92 +287,6 @@ trigger:
 type: docker
 ---
 kind: pipeline
-name: Publish Linux alloy-devel container
-platform:
-  arch: amd64
-  os: linux
-steps:
-- commands:
-  - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-  failure: ignore
-  image: grafana/alloy-build-image:v0.1.8
-  name: Configure QEMU
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - mkdir -p $HOME/.docker
-  - printenv GCR_CREDS > $HOME/.docker/config.json
-  - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-  - docker buildx create --name multiarch-alloy-alloy-devel-${DRONE_COMMIT_SHA} --driver
-    docker-container --use
-  - ./tools/ci/docker-containers alloy-devel
-  - docker buildx rm multiarch-alloy-alloy-devel-${DRONE_COMMIT_SHA}
-  environment:
-    DOCKER_LOGIN:
-      from_secret: docker_login
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    GCR_CREDS:
-      from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.8
-  name: Publish container
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-trigger:
-  ref:
-  - refs/heads/main
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
-kind: pipeline
-name: Publish Linux alloy-devel-boringcrypto container
-platform:
-  arch: amd64
-  os: linux
-steps:
-- commands:
-  - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-  failure: ignore
-  image: grafana/alloy-build-image:v0.1.8
-  name: Configure QEMU
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - mkdir -p $HOME/.docker
-  - printenv GCR_CREDS > $HOME/.docker/config.json
-  - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-  - docker buildx create --name multiarch-alloy-alloy-devel-boringcrypto-${DRONE_COMMIT_SHA}
-    --driver docker-container --use
-  - ./tools/ci/docker-containers alloy-devel-boringcrypto
-  - docker buildx rm multiarch-alloy-alloy-devel-boringcrypto-${DRONE_COMMIT_SHA}
-  environment:
-    DOCKER_LOGIN:
-      from_secret: docker_login
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    GCR_CREDS:
-      from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.8
-  name: Publish container
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-trigger:
-  ref:
-  - refs/heads/main
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
-kind: pipeline
 name: Publish Windows alloy-devel container
 platform:
   arch: amd64
@@ -527,53 +441,6 @@ volumes:
   name: docker
 ---
 depends_on:
-- Publish Linux alloy-devel container
-- Publish Linux alloy-devel-boringcrypto container
-image_pull_secrets:
-- dockerconfigjson_gar
-kind: pipeline
-name: Deploy to deployment_tools
-platform:
-  arch: amd64
-  os: linux
-steps:
-- commands:
-  - apk add --no-cache bash git
-  - echo "$(bash ./tools/image-tag-docker)" > .tag-only
-  - echo "grafana/alloy-dev:$(bash ./tools/image-tag-docker)" > .image-tag
-  image: alpine
-  name: Create .image-tag
-- image: us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater
-  name: Update deployment_tools
-  settings:
-    config_json: |
-      {
-        "git_committer_name": "updater-for-ci[bot]",
-        "git_author_name": "updater-for-ci[bot]",
-        "git_committer_email": "119986603+updater-for-ci[bot]@users.noreply.github.com",
-        "git_author_email": "119986603+updater-for-ci[bot]@users.noreply.github.com",
-        "destination_branch": "master",
-        "repo_name": "deployment_tools",
-        "update_jsonnet_attribute_configs": [
-          {
-            "file_path": "ksonnet/lib/alloy/waves/alloy.libsonnet",
-            "jsonnet_key": "dev_canary",
-            "jsonnet_value_file": ".image-tag"
-          }
-        ]
-      }
-    github_app_id:
-      from_secret: updater_app_id
-    github_app_installation_id:
-      from_secret: updater_app_installation_id
-    github_app_private_key:
-      from_secret: updater_private_key
-trigger:
-  ref:
-  - refs/heads/main
-type: docker
----
-depends_on:
 - Publish Linux alloy container
 - Publish Linux alloy-boringcrypto container
 - Publish Windows alloy container
@@ -627,34 +494,6 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
-kind: pipeline
-name: Test Linux system packages
-platform:
-  arch: amd64
-  os: linux
-steps:
-- commands:
-  - DOCKER_OPTS="" make dist/alloy-linux-amd64
-  - DOCKER_OPTS="" make test-packages
-  image: grafana/alloy-build-image:v0.1.8
-  name: Test Linux system packages
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-trigger:
-  paths:
-  - packaging/**
-  - internal/tools/packaging_test/**
-  - Makefile
-  - tools/make/*.mk
-  ref:
-  - refs/heads/main
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
 get:
   name: app-id
   path: infra/data/ci/agent/githubapp
@@ -740,6 +579,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: cf3043f3104be4dd320c4cd79c5e80802dc3b03743852df4fd98ffd981ae146e
+hmac: 26b5613cbd5e5cd42656c10c372d44dc93af565ec2ae212d3b27c2fe366c6aeb
 
 ...

.drone/pipelines/publish.jsonnet

@@ -14,56 +14,6 @@ local windows_containers = [
   { devel: 'alloy-devel', release: 'alloy' },
 ];
 
-local linux_containers_dev_jobs = std.map(function(container) (
-  pipelines.linux('Publish Linux %s container' % container.devel) {
-    trigger: {
-      ref: ['refs/heads/main'],
-    },
-    steps: [{
-      // We only need to run this once per machine, so it's OK if it fails. It
-      // is also likely to fail when run in parallel on the same machine.
-      name: 'Configure QEMU',
-      image: build_image.linux,
-      failure: 'ignore',
-      volumes: [{
-        name: 'docker',
-        path: '/var/run/docker.sock',
-      }],
-      commands: [
-        'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
-      ],
-    }, {
-      name: 'Publish container',
-      image: build_image.linux,
-      volumes: [{
-        name: 'docker',
-        path: '/var/run/docker.sock',
-      }],
-      environment: {
-        DOCKER_LOGIN: secrets.docker_login.fromSecret,
-        DOCKER_PASSWORD: secrets.docker_password.fromSecret,
-        GCR_CREDS: secrets.gcr_admin.fromSecret,
-      },
-      commands: [
-        'mkdir -p $HOME/.docker',
-        'printenv GCR_CREDS > $HOME/.docker/config.json',
-        'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
-
-        // Create a buildx worker for our cross platform builds.
-        'docker buildx create --name multiarch-alloy-%s-${DRONE_COMMIT_SHA} --driver docker-container --use' % container.devel,
-
-        './tools/ci/docker-containers %s' % container.devel,
-
-        'docker buildx rm multiarch-alloy-%s-${DRONE_COMMIT_SHA}' % container.devel,
-      ],
-    }],
-    volumes: [{
-      name: 'docker',
-      host: { path: '/var/run/docker.sock' },
-    }],
-  }
-), linux_containers);
-
 local windows_containers_dev_jobs = std.map(function(container) (
   pipelines.windows('Publish Windows %s container' % container.devel) {
     trigger: {
@@ -177,52 +127,8 @@ local windows_containers_jobs = std.map(function(container) (
   }
 ), windows_containers);
 
-linux_containers_dev_jobs + windows_containers_dev_jobs +
+windows_containers_dev_jobs +
 linux_containers_jobs + windows_containers_jobs + [
-  pipelines.linux('Deploy to deployment_tools') {
-    trigger: {
-      ref: ['refs/heads/main'],
-    },
-    image_pull_secrets: ['dockerconfigjson_gar'],
-    steps: [
-      {
-        name: 'Create .image-tag',
-        image: 'alpine',
-        commands: [
-          'apk add --no-cache bash git',
-          'echo "$(bash ./tools/image-tag-docker)" > .tag-only',
-          'echo "grafana/alloy-dev:$(bash ./tools/image-tag-docker)" > .image-tag',
-        ],
-      },
-      {
-        name: 'Update deployment_tools',
-        image: 'us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater',
-        settings: {
-          config_json: |||
-            {
-              "git_committer_name": "updater-for-ci[bot]",
-              "git_author_name": "updater-for-ci[bot]",
-              "git_committer_email": "119986603+updater-for-ci[bot]@users.noreply.github.com",
-              "git_author_email": "119986603+updater-for-ci[bot]@users.noreply.github.com",
-              "destination_branch": "master",
-              "repo_name": "deployment_tools",
-              "update_jsonnet_attribute_configs": [
-                {
-                  "file_path": "ksonnet/lib/alloy/waves/alloy.libsonnet",
-                  "jsonnet_key": "dev_canary",
-                  "jsonnet_value_file": ".image-tag"
-                }
-              ]
-            }
-          |||,
-          github_app_id: secrets.updater_app_id.fromSecret,
-          github_app_installation_id: secrets.updater_app_installation_id.fromSecret,
-          github_app_private_key: secrets.updater_private_key.fromSecret,
-        },
-      },
-    ],
-    depends_on: job_names(linux_containers_dev_jobs),
-  },
 
   pipelines.linux('Publish release') {
     trigger: {

.drone/pipelines/test_packages.jsonnet

@@ -12,7 +12,7 @@ jobs:
   linux_build_image:
     name: Create a Linux build image
     runs-on:
-      labels: github-hosted-ubuntu-x64-small
+      labels: github-hosted-ubuntu-x64-large
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
   linux_build_image_boringcrypto:
     name: Create a Linux build image for boringcrypto
     runs-on:
-      labels: github-hosted-ubuntu-x64-small
+      labels: github-hosted-ubuntu-x64-large
     steps:
     - name: Checkout code
       uses: actions/checkout@v4