Merge remote-tracking branch 'origin/master' into features/rules-proxy

Signed-off-by: Sergiusz Urbaniak <[email protected]>

.circleci/config.yml

@@ -1,10 +1,13 @@
 # NOTE: Current plan gives 1500 build minutes per month.
 version: 2
+# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
+defaults: &defaults
+  docker:
+    # Built by Thanos make docker-ci
+    - image: quay.io/thanos/thanos-ci:go1.14.2-node
 jobs:
   test:
-    docker:
-     # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.3.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GO111MODULE: 'on'
@@ -18,7 +21,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 17.07.0-ce
+          version: 17.07.0-ce
       - run:
           name: Create Secret if PR is not forked
           # GCS integration tests are run only for author's PR that have write access, because these tests
@@ -31,6 +34,7 @@ jobs:
       - run: make deps
       - run: make lint
       - run: make check-docs
+      - run: make check-examples
       - run: make format
       - run:
           name: "Run unit tests."
@@ -49,17 +53,15 @@ jobs:
     environment:
       GOBIN: "/home/circleci/.go_workspace/go/bin"
     steps:
-    - checkout
-    - run: make crossbuild
-    - persist_to_workspace:
-        root: .
-        paths:
-        - .build
+      - checkout
+      - run: make crossbuild
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .build
 
   publish_master:
-    docker:
-      # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.2.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     steps:
       - checkout
@@ -77,9 +79,7 @@ jobs:
       - run: make docker-push
 
   publish_release:
-    docker:
-      # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.2.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GOBIN: "/go/bin"
@@ -106,30 +106,30 @@ workflows:
   version: 2
   thanos:
     jobs:
-    - test:
-        filters:
-          tags:
-            only: /.*/
-    - publish_master:
-        requires:
-        - test
-        filters:
-          branches:
-            only: master
-    - cross_build:
-        requires:
-        - test
-        filters:
-          tags:
-            only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-          branches:
-            ignore: /.*/
-    - publish_release:
-        requires:
-        - test
-        - cross_build
-        filters:
-          tags:
-            only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-          branches:
-            ignore: /.*/
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - publish_master:
+          requires:
+            - test
+          filters:
+            branches:
+              only: master
+      - cross_build:
+          requires:
+            - test
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /.*/
+      - publish_release:
+          requires:
+            - test
+            - cross_build
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /.*/

.github/stale.yml

@@ -1,60 +1,52 @@
 # 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: []
+# If one issue is marked as 'reminder' by the reminder bot, we don't mark it as 'stale' again.
+exemptLabels:
+  # This label is hardcoded on remind bot (https://probot.github.io/apps/reminders/) and is used by remind bot when
+  # issue is being reminded.
+  - reminder
 
 # 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.
+pull:
+  daysUntilClose: 7
+  daysUntilStale: 30
+  markComment: >
+    Hello 👋 Looks like there was no activity on this amazing PR for last 30 days.
 
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
+    **Do you mind updating us on the status?** Is there anything we can help with? If you plan to still work on it, just comment on this PR or push a commit. Thanks! 🤗
 
-# Comment to post when closing a stale Issue or Pull Request.
-# closeComment: >
-#   Your comment here.
+    If there will be no activity for next week, this issue will be closed (we can always reopen a PR if you get back to this!).
+    Alternatively, use [`remind` command](https://probot.github.io/apps/reminders/) if you wish to be reminded at some point in future.
+  #unmarkComment: No need for unmark comment.
+  closeComment: >
+    Closing for now as promised, let us know if you need this to be reopened! 🤗
 
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-# Limit to only `issues` or `pulls`
-# only: issues
+issues:
+  daysUntilClose: 7
+  daysUntilStale: 30
+  markComment: >
+    Hello 👋 Looks like there was no activity on this issue for last 30 days.
 
-# 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.
+    **Do you mind updating us on the status?** Is this still reproducible or needed? If yes, just comment on this PR or push a commit. Thanks! 🤗
 
-# issues:
-#   exemptLabels:
-#     - confirmed
+    If there will be no activity for next week, this issue will be closed (we can always reopen an issue if we need!).
+    Alternatively, use [`remind` command](https://probot.github.io/apps/reminders/) if you wish to be reminded at some point in future.
+  #unmarkComment: No need for unmark comment.
+  closeComment: >
+    Closing for now as promised, let us know if you need this to be reopened! 🤗
 
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30

.github/workflows/cross-build.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13.6
+          go-version: 1.14.2
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1

.github/workflows/e2e.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13.6
+          go-version: 1.14.2
 
       - name: Check out code into the Go module directory.
         uses: actions/checkout@v2

.github/workflows/react-test.yml

@@ -0,0 +1,33 @@
+name: react-test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [ '10', '12' ]
+    name: React UI test on Node ${{ matrix.node }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('pkg/ui/react-app/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - run: make react-app-test

.gitignore

@@ -12,6 +12,7 @@ kube/.minikube
 
 # Ignore e2e working dirs.
 data/
+test/e2e/e2e_integration_test*
 
 # Ignore promu artifacts.
 /.build
@@ -25,5 +26,11 @@ website/public/
 website/docs-pre-processed/
 !website/data
 
+# React build assets
+pkg/ui/static/react
+
 tmp/bin
 examples/tmp/
+
+# Ignore the MacOS Trash (DS-Store)
+.DS_Store

.golangci.yml

@@ -32,6 +32,7 @@ linters:
     - deadcode
     - errcheck
     - goconst
+    - gofmt
     - goimports
     - gosimple
     - govet

.promu.yml

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