1.9 backport

.github/draft-release-notes-config.yml

@@ -0,0 +1,46 @@
+# The overall template of the release notes
+template: |
+  Compatible with Elasticsearch (**set version here**).
+  $CHANGES
+
+# Setting the formatting and sorting for the release notes body
+name-template: Version (set version here)
+change-template: "* $TITLE (#$NUMBER)"
+sort-by: merged_at
+sort-direction: ascending
+replacers:
+  - search: "##"
+    replace: "###"
+
+# Organizing the tagged PRs into unified ODFE categories
+categories:
+  - title: "Breaking changes"
+    labels:
+      - "breaking change"
+  - title: "Features"
+    labels:
+      - "feature"
+  - title: "Enhancements"
+    labels:
+      - "enhancement"
+  - title: "Bug Fixes"
+    labels:
+      - "bug"
+      - "bug fix"
+  - title: "Infrastructure"
+    labels:
+      - "infra"
+      - "test"
+      - "dependencies"
+      - "github actions"
+  - title: "Documentation"
+    labels:
+      - "documentation"
+  - title: "Maintenance"
+    labels:
+      - "version upgrade"
+      - "odfe release"
+  - title: "Refactoring"
+    labels:
+      - "refactor"
+      - "code quality"

.github/workflows/CI.yml

@@ -46,7 +46,6 @@ jobs:
 
             ## The ESRestTest Client uses http by default.
             ## Need to disable the security plugin to call the rest api over http.
-            echo "RUN if [ -d /usr/share/elasticsearch/plugins/opendistro_security ]; then /usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro_security; fi" >> Dockerfile
             echo "RUN if [ -d /usr/share/elasticsearch/plugins/opendistro-anomaly-detection ]; then /usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro-anomaly-detection; fi" >> Dockerfile
             echo "ADD anomaly-detection/build/distributions/opendistro-anomaly-detection-$plugin_version.zip /tmp/" >> Dockerfile
             echo "RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch file:/tmp/opendistro-anomaly-detection-$plugin_version.zip" >> Dockerfile
@@ -63,9 +62,22 @@ jobs:
           cd ..
           docker run -p 9200:9200 -d -p 9600:9600 -e "discovery.type=single-node" odfe-ad:test
           sleep 90
-          curl -XGET http://localhost:9200/_cat/plugins
 
       - name: Run AD Test
         if: env.imagePresent == 'true'
         run: |
-          ./gradlew :integTestRunner --tests "com.amazon.opendistroforelasticsearch.ad.rest.*IT" --tests "com.amazon.opendistroforelasticsearch.ad.e2e.*IT" -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster"
+          security=`curl -XGET https://localhost:9200/_cat/plugins?v -u admin:admin --insecure |grep opendistro_security|wc -l`
+          if [ $security -gt 0 ]
+          then
+            echo "Security plugin is available"
+            ./gradlew :integTestRunner --tests "com.amazon.opendistroforelasticsearch.ad.rest.*IT" --tests "com.amazon.opendistroforelasticsearch.ad.e2e.*IT" -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dhttps=true -Duser=admin -Dpassword=admin -PnumNodes=2
+          else
+            echo "Security plugin is NOT available"
+            ./gradlew :integTestRunner --tests "com.amazon.opendistroforelasticsearch.ad.rest.*IT" --tests "com.amazon.opendistroforelasticsearch.ad.e2e.*IT" -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -PnumNodes=2
+          fi
+      - name: Upload Coverage Report
+        uses: codecov/codecov-action@v1
+        with:
+          file: ./build/reports/jacoco/test/jacocoTestReport.xml
+          flags: plugin
+

.github/workflows/draft-release-notes-workflow.yml

@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    name: Update draft release notes
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update draft release notes
+        uses: release-drafter/release-drafter@v5
+        with:
+          config-name: draft-release-notes-config.yml
+          name: Version (set here)
+          tag: (None)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/esad-cli-publish-artifact-workflow.yml

@@ -0,0 +1,60 @@
+name: Publish AD CLI
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cli
+    steps:
+      - name: Set up Go ubuntu-latest
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+
+      - name: Check out AD CLI
+        uses: actions/checkout@v2
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: --snapshot --skip-publish
+          workdir: cli
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload macOS(amd64) Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: esad-darwin-amd64
+          path: cli/dist/esad_darwin_amd64/esad
+
+      - name: Upload Linux(amd64) Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: esad-linux-amd64
+          path: cli/dist/esad_linux_amd64/esad
+
+      - name: Upload Linux(arm64) Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: esad-linux-arm64
+          path: cli/dist/esad_linux_arm64/esad
+
+      - name: Upload Windows(i386) Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: esad-windows-386
+          path: cli/dist/esad_windows_386/esad.exe
+
+      - name: Upload Windows(amd64) Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: esad-windows-amd64
+          path: cli/dist/esad_windows_amd64/esad.exe
+

.github/workflows/esad-cli-test-and-build-workflow.yml

@@ -0,0 +1,78 @@
+name: AD CLI Test and Build
+on: [pull_request, push]
+
+jobs:
+  build:
+    defaults:
+      run:
+        working-directory: cli
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+        go-version: [1.14]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Set up Go ${{ matrix.platform }}
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Check out AD CLI
+        uses: actions/checkout@v2
+
+      - name: Build
+        env:
+          GOPROXY: "https://proxy.golang.org"
+        run: go build .
+
+  code-analysis:
+    defaults:
+      run:
+        working-directory: cli
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go ubuntu-latest
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+
+      - name: Check out AD CLI
+        uses: actions/checkout@v2
+
+      - name: Format
+        run: |
+          cd ..
+          go get golang.org/x/tools/cmd/goimports
+          cd cli
+          goimports -w .
+      - name: Check for modified files
+        id: git-check
+        run: |
+          echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)
+      - name: Display unformated changes
+        if: steps.git-check.outputs.modified == 'true'
+        run: |
+          echo "Failed to format using goimports".
+          git diff
+          exit 1
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v1
+        with:
+          version: v1.28
+          working-directory: cli
+
+      - name: Run coverage
+        env:
+          GOPROXY: "https://proxy.golang.org"
+        run: |
+          go test ./...  -coverprofile=coverage.out
+          go tool cover -func=coverage.out
+
+      - name: Upload coverage to Codecov
+        uses: codecov/[email protected]
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          file: cli/coverage.out
+          flags: cli
+          name: codecov-umbrella

README.md

@@ -1,3 +1,9 @@
+[![AD Test](https://github.com/opendistro-for-elasticsearch/anomaly-detection/workflows/Build%20and%20Test%20Anomaly%20detection/badge.svg)](https://github.com/opendistro-for-elasticsearch/anomaly-detection/actions?query=workflow%3A%22Build+and+Test+Anomaly+detection%22+branch%3A%22master%22)
+[![codecov](https://codecov.io/gh/opendistro-for-elasticsearch/anomaly-detection/branch/master/graph/badge.svg?flag=plugin)](https://codecov.io/gh/opendistro-for-elasticsearch/anomaly-detection)
+[![Documentation](https://img.shields.io/badge/doc-reference-blue)](https://opendistro.github.io/for-elasticsearch-docs/docs/ad/)
+[![Forum](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/Use-this-category-for-all-questions-around-machine-learning-plugins)
+![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success)
+
 ## Open Distro for Elasticsearch Anomaly Detection
 
 The Open Distro for Elasticsearch Anomaly Detection plugin enables you to leverage Machine Learning based algorithms to automatically detect anomalies as your log data is ingested. Combined with Alerting, you can monitor your data in near real time and automatically send alert notifications . With an intuitive Kibana interface and a powerful API, it is easy to set up, tune, and monitor your anomaly detectors.

build.gradle

@@ -130,6 +130,11 @@ integTest {
     runner {
         systemProperty 'tests.security.manager', 'false'
         systemProperty 'java.io.tmpdir', es_tmp_dir.absolutePath
+
+        systemProperty "https", System.getProperty("https")
+        systemProperty "user", System.getProperty("user")
+        systemProperty "password", System.getProperty("password")
+
         // The 'doFirst' delays till execution time.
         doFirst {
             // Tell the test JVM if the cluster JVM is running under a debugger so that tests can
@@ -268,6 +273,13 @@ jacocoTestCoverageVerification {
     }
 }
 
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+}
+
 check.dependsOn jacocoTestCoverageVerification
 jacocoTestCoverageVerification.dependsOn jacocoTestReport
 
@@ -371,4 +383,4 @@ validateNebulaPom.enabled = false
 
 tasks.withType(licenseHeaders.class) {
     additionalLicense 'AL   ', 'Apache', 'Licensed under the Apache License, Version 2.0 (the "License")'
-}
+}

cli/.gitignore

@@ -0,0 +1,23 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# IDE Settings
+.idea/*
+
+#OS Settings
+.DS_Store
+
+# Test binary, built with `go test -c`
+*.test
+
+bin
+.go
+.push-*
+.container-*
+.dockerfile-*
+
+/coverage.out

cli/.goreleaser.yml

@@ -0,0 +1,39 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+project_name: esad
+dist: ./dist
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod download
+builds:
+- env:
+  - CGO_ENABLED=0
+  goos:
+  - linux
+  - windows
+  - darwin
+  goarch:
+  - 386
+  - amd64
+  - arm
+  - arm64
+  ignore:
+    - goos: darwin
+      goarch: 386
+archives:
+-
+  name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+  format_overrides:
+  - goos: windows
+    format: zip
+checksum:
+  name_template: '{{ .ProjectName }}_checksums.txt'
+snapshot:
+  name_template: '{{ .ProjectName }}_{{ .Version }}'