Merge release v0.18.0 (#787)

* Initialize biggest ref to existing ref when reading a segment (#676) * initialize biggest ref to existing ref when reading a segment * changelog * allow new test to be less hard-coded * explain error if test fails * clarify changelog issue * prepare for v0.16.1 release (#679) * adding docker-compose example for local testing (cherry picked from commit 992e3cf) * Cherry picking kafka importer * update Operator FAQ to describe custom scrape jobs (#658) * Merge * merge for race condition * Wall cherry pick * Import Kafka * Bump version number to v0.17.0 * Initial release of v0.18.0 includes github_exporter, enabled flag issue, OTLP HTPP, and updated postgres exporter * Tempo/traces docs fixes for v0.18.0 (#784) * Needs to be loki for the naming change * Update date * No change, just trying to trigger drone * Fix for drone naming * Changes that needed to me imported for drone to work. * Update drone issues * sign drone * Drone changes * Update operator * standardize on seego * Test tag * fix tag * updated makefile * release tag fixing * remove extra tag * Readd missing upgrade info * Restructure based on new doc format * Small tweaks * Merge issues and naming * Change some minor formatting * Change some minor formatting Co-authored-by: Robert Fratto <robert.fratto@grafana.com> Co-authored-by: Gabriel <g.amaral.antunes@gmail.com> Co-authored-by: Mario <mariorvinas@gmail.com>
grafana · Aug 3, 2021 · 997675b · 997675b
1 parent 1f436f5
commit 997675b
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 133 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -6,20 +6,21 @@ platform:
   arch: amd64
 trigger:
   event:
-  - push
-  - pull_request
-  - tag 
+    - push
+    - pull_request
+    - tag
   ref:
-  - refs/heads/main
-  - refs/pull/*/head
-  - refs/tags/**
+    - refs/heads/main
+    - refs/pull/*/head
+    - refs/tags/**
 
 steps:
-- name: lint
-  image: golangci/golangci-lint:v1.37.1
-  commands:
-  - apt-get update -y && apt-get install -y libsystemd-dev
-  - make lint
+  - name: lint
+    image: golangci/golangci-lint:v1.37.1
+    commands:
+      - echo $DRONE_TAG
+      - apt-get update -y && apt-get install -y libsystemd-dev
+      - make lint
 
 ---
 kind: pipeline
@@ -30,27 +31,27 @@ platform:
   arch: amd64
 trigger:
   event:
-  - push
-  - pull_request
-  - tag 
+    - push
+    - pull_request
+    - tag
   ref:
-  - refs/heads/main
-  - refs/pull/*/head
-  - refs/tags/**
+    - refs/heads/main
+    - refs/pull/*/head
+    - refs/tags/**
 
 steps:
-- name: test
-  image: rfratto/seego
-  commands:
-  - apt-get update &&  apt-get install -y rubygems rpm nsis  apt-transport-https ca-certificates curl gnupg lsb-release
-  - gem install --no-document fpm
-  - mkdir -p /usr/local/go/bin
-  - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
-  - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
-  - rm go1.16.5.linux-amd64.tar.gz
-  - export PATH=$PATH:/usr/local/go/bin
-  - make cmd/agent/agent cmd/agentctl/agentctl cmd/agent-operator/agent-operator
-  - make DRONE=true BUILD_IN_CONTAINER=false test
+  - name: test
+    image: rfratto/seego
+    commands:
+      - apt-get update &&  apt-get install -y rubygems rpm nsis  apt-transport-https ca-certificates curl gnupg lsb-release
+      - gem install --no-document fpm
+      - mkdir -p /usr/local/go/bin
+      - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
+      - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
+      - rm go1.16.5.linux-amd64.tar.gz
+      - export PATH=$PATH:/usr/local/go/bin
+      - make cmd/agent/agent cmd/agentctl/agentctl cmd/agent-operator/agent-operator
+      - make DRONE=true BUILD_IN_CONTAINER=false test
 depends_on:
   - Lint
 
@@ -63,20 +64,20 @@ platform:
   arch: amd64
 trigger:
   ref:
-  - refs/tags/v*
+    - refs/tags/v*
 
 steps:
-- name: distribute
-  image: rfratto/seego
-  commands:
-  - apt-get update &&  apt-get install -y rubygems rpm nsis
-  - gem install --no-document fpm
-  - mkdir -p /usr/local/go/bin
-  - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
-  - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
-  - rm go1.16.5.linux-amd64.tar.gz
-  - export PATH=$PATH:/usr/local/go/bin
-  - make DRONE=true BUILD_IN_CONTAINER=false RELEASE_TAG=v0.0.0 dist
+  - name: distribute
+    image: rfratto/seego
+    commands:
+      - apt-get update &&  apt-get install -y rubygems rpm nsis
+      - gem install --no-document fpm
+      - mkdir -p /usr/local/go/bin
+      - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
+      - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
+      - rm go1.16.5.linux-amd64.tar.gz
+      - export PATH=$PATH:/usr/local/go/bin
+      - make DRONE=true BUILD_IN_CONTAINER=false RELEASE_TAG=v0.0.0 dist
 depends_on:
   - Test
 ---
@@ -88,42 +89,43 @@ platform:
   arch: amd64
 trigger:
   ref:
-  - refs/heads/main
-  - refs/tags/v*
+    - refs/heads/main
+    - refs/tags/v*
 
 steps:
-- name: Build Containers
-  image: docker
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-  environment:
-    DOCKER_LOGIN:
-      from_secret: DOCKER_LOGIN
-    DOCKER_PASSWORD:
-      from_secret: DOCKER_PASSWORD
-  commands:
-  - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-  - apk update && apk add make bash wget git qemu
-  - wget -q https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64
-  - mkdir -p ~/.docker/cli-plugins 
-  - cp buildx-v0.5.1.linux-amd64 ~/.docker/cli-plugins/docker-buildx
-  - chmod a+x ~/.docker/cli-plugins/docker-buildx
-  - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-  - docker buildx create --name multiarch --driver docker-container --use
-  - make DRONE=true CROSS_BUILD=true RELEASE_BUILD=true RELEASE_TAG=$DRONE_TAG agent-image
-  - make DRONE=true CROSS_BUILD=true RELEASE_BUILD=true RELEASE_TAG=$DRONE_TAG agentctl-image
-  - make DRONE=true CROSS_BUILD=true RELEASE_BUILD=true RELEASE_TAG=$DRONE_TAG agent-operator-image
-  - docker buildx rm multiarch
+  - name: Build Containers
+    image: docker
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_LOGIN:
+        from_secret: DOCKER_LOGIN
+      DOCKER_PASSWORD:
+        from_secret: DOCKER_PASSWORD
+    commands:
+      - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+      - apk update && apk add make bash wget git qemu
+      - wget -q https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64
+      - mkdir -p ~/.docker/cli-plugins
+      - cp buildx-v0.5.1.linux-amd64 ~/.docker/cli-plugins/docker-buildx
+      - chmod a+x ~/.docker/cli-plugins/docker-buildx
+      - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      - docker buildx create --name multiarch --driver docker-container --use
+      - export RELEASE_TAG=$DRONE_TAG
+      - make DRONE=true CROSS_BUILD=true BUILD_IN_CONTAINER=true RELEASE_BUILD=true agent-image
+      - make DRONE=true CROSS_BUILD=true BUILD_IN_CONTAINER=true RELEASE_BUILD=true agentctl-image
+      - make DRONE=true CROSS_BUILD=true BUILD_IN_CONTAINER=true RELEASE_BUILD=true agent-operator-image
+      - docker buildx rm multiarch
 
 
 depends_on:
   - Test
 
 volumes:
-- name: docker
-  host: 
-    path: /var/run/docker.sock
+  - name: docker
+    host:
+      path: /var/run/docker.sock
 ---
 kind: pipeline
 type: docker
@@ -133,45 +135,45 @@ platform:
   arch: amd64
 trigger:
   ref:
-  - refs/tags/v*
+    - refs/tags/v*
 
 steps:
-- name: create-release
-  image: rfratto/seego
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-  environment:
-    DOCKER_LOGIN:
-      from_secret: DOCKER_LOGIN
-    DOCKER_PASSWORD:
-      from_secret: DOCKER_PASSWORD
-    GITHUB_TOKEN:
-      from_secret: GITHUB_KEY
-  commands:
-  - apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
-  - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-  - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian buster stable"
-  - apt-get update &&  apt-get install -y rubygems rpm nsis docker-ce docker-ce-cli containerd.io
-  - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-  - gem install --no-document fpm
-  - mkdir -p /usr/local/go/bin
-  - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
-  - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
-  - rm go1.16.5.linux-amd64.tar.gz
-  - export PATH=$PATH:/usr/local/go/bin
-  - GO111MODULE=on go get -u github.com/mitchellh/gox github.com/tcnksm/ghr
-  - export PATH="$(go env GOPATH)/bin:$PATH"
-  - make -j4 BUILD_IN_CONTAINER=false RELEASE_BUILD=true RELEASE_TAG=$DRONE_TAG publish
+  - name: create-release
+    image: rfratto/seego
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_LOGIN:
+        from_secret: DOCKER_LOGIN
+      DOCKER_PASSWORD:
+        from_secret: DOCKER_PASSWORD
+      GITHUB_TOKEN:
+        from_secret: GITHUB_KEY
+    commands:
+      - apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
+      - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
+      - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian buster stable"
+      - apt-get update &&  apt-get install -y rubygems rpm nsis docker-ce docker-ce-cli containerd.io
+      - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+      - gem install --no-document fpm
+      - mkdir -p /usr/local/go/bin
+      - wget -q https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
+      - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
+      - rm go1.16.5.linux-amd64.tar.gz
+      - export PATH=$PATH:/usr/local/go/bin
+      - GO111MODULE=on go get -u github.com/mitchellh/gox github.com/tcnksm/ghr
+      - export PATH="$(go env GOPATH)/bin:$PATH"
+      - make -j4 BUILD_IN_CONTAINER=false RELEASE_BUILD=true RELEASE_TAG=$DRONE_TAG publish
 depends_on:
   - Dist
 
 volumes:
-- name: docker
-  host: 
-    path: /var/run/docker.sock
+  - name: docker
+    host:
+      path: /var/run/docker.sock
 ---
 kind: signature
-hmac: 670cf64db6fd792fbb5b1e33d77be8ac23d2631e1a3d75308abb9d2c39522247
+hmac: a591ba790350023b3c81df8639ecf4e9e84b6b0ac10784ce2cd1861881380b5c
 
 ...
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 .vscode
 vendor
 cover*.out
+vendor
 
 cmd/agent/agent
 cmd/agentctl/agentctl

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,6 @@
 
 - [FEATURE] Add TLS config options for tempo `remote_write`s. (@mapno)
 
-- [FEATURE] Add support for OTLP HTTP trace exporting. (@mapno)
-
 - [FEATURE] Support autologging span attributes as log labels (@mapno)
 
 - [FEATURE] Put Tests requiring Network Access behind a -online flag (@flokli)
@@ -18,17 +16,13 @@
 
 - [ENHANCEMENT] Allow reloading configuration using `SIGHUP` signal. (@tharun208)
 
-- [ENHANCEMENT] Switch to drone for releases. (@mattdurham)
-
-- [ENHANCEMENT] Update postgres_exporter to a [branch of](https://github.com/grafana/postgres_exporter/tree/exporter-package-v0.10.0) v0.10.0
-
 - [BUGFIX] Regex capture groups like `${1}` will now be kept intact when
   using `-config.expand-env`.
 
 - [BUGFIX] The directory of the logs positions file will now properly be created
   on startup for all instances.
 
-- [BUGFIX] The Liunx system packages will now configure the grafana-agent user
+- [BUGFIX] The Linux system packages will now configure the grafana-agent user
   to be a member of the adm and systemd-journal groups. This will allow logs to
   read from journald and /var/log by default. (@rfratto)
 
@@ -41,11 +35,23 @@
   `loki_tag` is now `logs_instance_tag`, and `backend: loki` is now
   `backend: logs_instance`. (@rfratto)
 
+# v0.18.0 (2021-07-29)
+
+- [FEATURE] Added [Github exporter](https://github.com/infinityworks/github-exporter) integration. (@rgeyer)
+
+- [FEATURE] Add support for OTLP HTTP trace exporting. (@mapno)
+
+- [ENHANCEMENT] Switch to drone for releases. (@mattdurham)
+
+- [ENHANCEMENT] Update postgres_exporter to a [branch of](https://github.com/grafana/postgres_exporter/tree/exporter-package-v0.10.0) v0.10.0
+
+- [BUGFIX]  Enabled flag is not being honored. (@mattdurham)
+
 # v0.17.0 (2021-07-15)
 
 - [FEATURE] Added [Kafka Lag exporter](https://github.com/davidmparrott/kafka_exporter)
   integration. (@gaantunes)
-
+  
 - [BUGFIX] Fix race condition that may occur and result in a panic when
   initializing scraping service cluster. (@rfratto)
 
@@ -61,8 +67,6 @@
 - [ENHANCEMENT] Error messages when installing the Grafana Agent for Grafana
   Cloud will now be shown. (@rfratto)
 
-- [BUGFIX]  Enabled flag is not being honored. (@mattdurham)
-
 - [BUGFIX] Fix a leak in the shared string interner introduced in v0.14.0.
   This fix was made to a [dependency](https://github.com/grafana/prometheus/pull/21).
   (@rfratto)