Merge pull request #23 from pgier/update-thanos-v0.11.0

Update thanos v0.11.0

.circleci/config.yml

@@ -4,11 +4,11 @@ jobs:
   test:
     docker:
      # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.2.0
+      - image: quay.io/thanos/thanos-ci:v0.3.0
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GO111MODULE: 'on'
-      # Run garbage collection more aggresively to avoid getting OOMed during the lint phase (4GB limit).
+      # Run garbage collection more aggressively to avoid getting OOMed during the lint phase (4GB limit).
       GOGC: "20"
       # By default Go uses GOMAXPROCS but a Circle CI executor has many
       # cores (> 30) while the CPU and RAM resources are throttled. If we
@@ -26,22 +26,21 @@ jobs:
           command: |
             if ! [ -z ${GCP_PROJECT} ]; then
               echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > $GOOGLE_APPLICATION_CREDENTIALS
-              echo "Awesome! GCS integration tests are enabled."
+              echo "Awesome! GCS and S3 AWS integration tests are enabled."
             fi
       - run: make deps
       - run: make lint
       - run: make check-docs
       - run: make format
       - run:
           name: "Run all tests"
-          # TODO(bwplotka): Setup some S3 tests for CI.
           # taskset sets CPU affinity to 2 (current CPU limit).
           command: |
             if [ -z ${GCP_PROJECT} ]; then
               taskset 2 make test-local
               exit
             fi
-            taskset 2 make test-only-gcs
+            taskset 2 make test-ci
 
   # Cross build is needed for publish_release but needs to be done outside of docker.
   cross_build:
@@ -60,7 +59,7 @@ jobs:
   publish_master:
     docker:
       # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.1.0
+      - image: quay.io/thanos/thanos-ci:v0.2.0
     working_directory: /go/src/github.com/thanos-io/thanos
     steps:
       - checkout
@@ -79,8 +78,8 @@ jobs:
 
   publish_release:
     docker:
-      # Available from https://hub.docker.com/r/circleci/golang/
-      - image: circleci/golang:1.13.1
+      # Build by Thanos make docker-ci
+      - image: quay.io/thanos/thanos-ci:v0.2.0
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GOBIN: "/go/bin"

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,12 @@
     about what components it touches e.g "query:" or ".*:"
 -->
 
-<!-- 
-    Don't forget about CHANGELOG! 
-    
+<!--
+    Don't forget about CHANGELOG!
+
     Changelog entry format:
     - [#<PR-id>](<PR-URL>) Thanos <Component> ...
-    
+
     <PR-id> Id of your pull request.
     <PR-URL> URL of your PR such as https://github.com/thanos-io/thanos/pull/<PR-id>
     <Component> Component affected by your changes such as Query, Store, Receive.

.github/stale.yml

@@ -0,0 +1,60 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable.
+# We want stale bot to notify us that something is stale so we can revisit it.
+exemptLabels: []
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue/PR has been automatically marked as stale because it has not had
+  recent activity. Please comment on status otherwise the issue will be closed in a week. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed
+

.github/workflows/ci.yaml

@@ -0,0 +1,21 @@
+name: CI
+on: [pull_request]
+
+jobs:
+  cross-build-check:
+    name: Cross build check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+
+      - name: Get dependencies
+        run: make deps
+
+      - name: Cross build check
+        run: make crossbuild

.gitignore

@@ -2,6 +2,7 @@
 
 /prometheus
 /thanos
+/mixin/vendor/
 
 # Ignore minikube setup working dirs.
 kube/bin
@@ -24,3 +25,4 @@ website/docs-pre-processed/
 !website/data
 
 tmp/bin
+examples/tmp/

.golangci.yml

@@ -1,3 +1,47 @@
+# This file contains all available configuration options
+# with their default values.
+
+# options for analysis running
+run:
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  deadline: 5m
+
+  # exit code when at least one issue was found, default is 1
+  issues-exit-code: 1
+
+  # which dirs to skip: they won't be analyzed;
+  # can use regexp here: generated.*, regexp is applied on full path;
+  # default value is empty list, but next dirs are always skipped independently
+  # from this option's value:
+  #     vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  skip-dirs: vendor
+
+# output configuration options
+output:
+  # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number"
+  format: colored-line-number
+
+  # print lines of code with issue, default is true
+  print-issued-lines: true
+
+  # print linter name in the end of issue text, default is true
+  print-linter-name: true
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - goconst
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+
 linters-settings:
     errcheck:
         exclude: ./.errcheck_excludes.txt

.promu.yml

@@ -1,5 +1,5 @@
 go:
-    version: 1.13.1
+    version: 1.13.6
 repository:
     path: github.com/thanos-io/thanos
 build: