latest master

.circleci/config.yml

@@ -5,11 +5,13 @@ workflows:
   test-build-deploy:
     jobs:
     - test
+    - test-helm
     - build
     - lint
     - publish:
         requires:
         - test
+        - test-helm
         - build
         - lint
         filters:
@@ -18,6 +20,7 @@ workflows:
     - publish-master:
         requires:
         - test
+        - test-helm
         - build
         - lint
         filters:
@@ -26,6 +29,7 @@ workflows:
     - publish-helm:
         requires:
         - test
+        - test-helm
         - build
         - lint
         filters:
@@ -41,7 +45,7 @@ workflows:
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 defaults: &defaults
   docker:
-    - image: grafana/loki-build-image:0.1.0
+    - image: grafana/loki-build-image:0.3.0
   working_directory: /go/src/github.com/grafana/loki
 
 jobs:
@@ -53,8 +57,7 @@ jobs:
       - run:
           name: Run Unit Tests
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false test
+            make test
 
   lint:
     <<: *defaults
@@ -64,13 +67,11 @@ jobs:
       - run:
           name: Lint
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false lint
+            make lint
 
       - run:
           name: Check Generated Fies
           command: |
-            touch loki-build-image/.uptodate &&
             make BUILD_IN_CONTAINER=false check-generated-files
 
   build:
@@ -79,23 +80,33 @@ jobs:
       - checkout
       - setup_remote_docker
 
+      - run:
+          name: Promtail cross platform
+          command: |
+            make GOOS=linux BUILD_IN_CONTAINER=false promtail
+            rm cmd/promtail/promtail
+            make GOOS=windows BUILD_IN_CONTAINER=false promtail
+
       - run:
           name: Build Images
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false
+            make images
 
       - run:
           name: Save Images
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false save-images
+            make save-images
 
       - save_cache:
           key: v1-loki-{{ .Branch }}-{{ .Revision }}
           paths:
           - images/
 
+      - save_cache:
+          key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}
+          paths:
+          - cmd/docker-driver/docker-driver
+
   publish:
     <<: *defaults
     steps:
@@ -104,12 +115,13 @@ jobs:
 
       - restore_cache:
           key: v1-loki-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}
 
       - run:
           name: Load Images
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false load-images
+            make load-images
 
       - run:
           name: Push Images
@@ -119,6 +131,14 @@ jobs:
               make push-images
             fi
 
+      - run:
+          name: Push Docker Plugin
+          command: |
+            if [ -n "$DOCKER_USER" ]; then
+              docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
+              make BUILD_IN_CONTAINER=false docker-driver-push
+            fi
+
   publish-master:
     <<: *defaults
     steps:
@@ -127,19 +147,61 @@ jobs:
 
       - restore_cache:
           key: v1-loki-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}
 
       - run:
           name: Load Images
           command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false load-images
+            make load-images
 
       - run:
           name: Push Images
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
             make push-latest
 
+      - run:
+          name: Push Docker Plugin
+          command: |
+            if [ -n "$DOCKER_USER" ]; then
+              docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
+              PLUGIN_TAG=master make BUILD_IN_CONTAINER=false docker-driver-push && PLUGIN_TAG=latest make BUILD_IN_CONTAINER=false docker-driver-push
+            fi
+
+  test-helm:
+    environment:
+      CT_VERSION: 2.3.3
+    machine:
+      image: ubuntu-1604:201903-01
+    steps:
+      - checkout
+      - run:
+          name: Install k3s
+          command: |
+            curl -sfL https://get.k3s.io | sh -
+            sudo chmod 755 /etc/rancher/k3s/k3s.yaml
+            mkdir -p ~/.kube
+            cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
+      - run:
+          name: Install Helm
+          command: |
+            curl -L https://git.io/get_helm.sh | bash
+            kubectl apply -f tools/helm.yaml
+            helm init --service-account helm --wait
+      - run:
+          name: Install Chart Testing tool
+          command: |
+            pip install yamale yamllint
+            curl -Lo ct.tgz https://github.com/helm/chart-testing/releases/download/v${CT_VERSION}/chart-testing_${CT_VERSION}_linux_amd64.tar.gz
+            sudo tar -C /usr/local/bin -xvf ct.tgz
+            sudo mv /usr/local/bin/etc /etc/ct/
+      - run:
+          name: Run Chart Tests
+          command: |
+            ct lint --chart-dirs=production/helm --check-version-increment=false --validate-maintainers=false
+            ct install --build-id=${CIRCLE_BUILD_NUM} --charts production/helm/loki-stack
+
   publish-helm:
     <<: *defaults
     steps:
@@ -159,3 +221,24 @@ jobs:
             --data "{\"build_parameters\": {\"CIRCLE_JOB\": \"deploy\", \"IMAGE_NAMES\": \"$(make images)\"}}" \
             --request POST \
             https://circleci.com/api/v1.1/project/github/raintank/deployment_tools/tree/master?circle-token=$CIRCLE_TOKEN
+
+  release:
+    <<: *defaults
+    steps:
+      - checkout
+      - setup_remote_docker
+      - restore_cache:
+          key: v1-loki-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Load Images
+          command: |
+            touch loki-build-image/.uptodate &&
+            make BUILD_IN_CONTAINER=false load-images
+      - run:
+          name: "Print Tag"
+          command: echo ${CIRCLE_TAG}
+      - run:
+          name: "Release"
+          command: |
+            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
+            make VERSION=${CIRCLE_TAG} release-perform

.github/pull_request_template.md

@@ -0,0 +1,19 @@
+<!--  Thanks for sending a pull request!  Before submitting:
+
+1. Read our CONTRIBUTING.md guide
+2. Name your PR as `<Feature Area>: Describe your change`
+3. Rebase your PR if it gets out of sync with master
+4. If changing the Helm chart, please ensure the chart version is increased per semantic versioning (https://semver.org)
+-->
+
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes**:
+Fixes #<issue number>
+
+**Special notes for your reviewer**:
+
+**Checklist**
+- [ ] Documentation added
+- [ ] Tests updated
+

.gitignore

@@ -1,4 +1,5 @@
 .uptodate
+.uptodate-debug
 .pkg
 .cache
 *.output
@@ -7,6 +8,13 @@ requirements.lock
 mixin/vendor/
 cmd/loki/loki
 cmd/promtail/promtail
+cmd/loki/loki-debug
+cmd/promtail/promtail-debug
+cmd/docker-driver/docker-driver
+cmd/loki-canary/loki-canary
 /loki
 /promtail
 /logcli
+/loki-canary
+dlv
+rootfs/

.golangci.yml

@@ -0,0 +1,66 @@
+# This file contains all available configuration options
+# with their default values.
+
+# options for analysis running
+run:
+  # default concurrency is a available CPU number
+  concurrency: 2
+
+  # 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
+
+  # include test files or not, default is true
+  tests: true
+
+  # list of build tags, all linters use it. Default is empty list.
+  build-tags:
+
+  # 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:
+  # which files to skip: they will be analyzed, but issues from them
+  # won't be reported. Default value is empty list, but there is
+  # no need to include all autogenerated files, we confidently recognize
+  # autogenerated files. If it's not please let us know.
+  skip-files:
+# 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
+    - gofmt
+    - goimports
+    - golint
+    - gosimple
+    - ineffassign
+    - megacheck
+    - misspell
+    - structcheck
+    - unconvert
+    - unparam
+    - varcheck
+    - govet
+    - unused # new from here.
+    - interfacer
+    - typecheck
+
+issues:
+  exclude:
+    - Error return value of .*log\.Logger\)\.Log\x60 is not checked