Merge branch 'master' into 7.14.1-release-notes

Jenkinsfile

@@ -42,7 +42,6 @@ pipeline {
     booleanParam(name: 'test_sys_env_ci', defaultValue: true, description: 'Enable system and environment test')
     booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable benchmarks')
     booleanParam(name: 'release_ci', defaultValue: true, description: 'Enable build the release packages')
-    booleanParam(name: 'kibana_update_ci', defaultValue: true, description: 'Enable build the Check kibana Obj. Updated')
     booleanParam(name: 'its_ci', defaultValue: true, description: 'Enable async ITs')
     string(name: 'DIAGNOSTIC_INTERVAL', defaultValue: "0", description: 'Elasticsearch detailed logging every X seconds')
     string(name: 'ES_LOG_LEVEL', defaultValue: "error", description: 'Elasticsearch error level')
@@ -389,37 +388,6 @@ pipeline {
             }
           }
         }
-        /**
-        Checks if kibana objects are updated.
-        */
-        stage('Check kibana Obj. Updated') {
-          agent { label 'linux && immutable' }
-          options { skipDefaultCheckout() }
-          environment {
-            PATH = "${env.PATH}:${env.WORKSPACE}/bin"
-            HOME = "${env.WORKSPACE}"
-          }
-          when {
-            beforeAgent true
-            allOf {
-              expression { return params.kibana_update_ci }
-              expression { return env.ONLY_DOCS == "false" }
-            }
-          }
-          steps {
-            withGithubNotify(context: 'Sync Kibana') {
-              deleteDir()
-              unstash 'source'
-              dir("${BASE_DIR}"){
-                withMageEnv(){
-                  catchError(buildResult: 'SUCCESS', message: 'Sync Kibana is not updated', stageResult: 'UNSTABLE') {
-                    sh(label: 'Test Sync', script: './.ci/scripts/sync.sh')
-                  }
-                }
-              }
-            }
-          }
-        }
         stage('Hey-Apm') {
           agent { label 'linux && immutable' }
           options { skipDefaultCheckout() }

Makefile

@@ -195,16 +195,6 @@ update-beats-module:
 	find . -maxdepth 2 -name Dockerfile -exec sed -i'.bck' -E -e "s#(FROM golang):[0-9]+\.[0-9]+\.[0-9]+#\1:$$(cat .go-version)#g" {} \;
 	sed -i'.bck' -E -e "s#(:go-version): [0-9]+\.[0-9]+\.[0-9]+#\1: $$(cat .go-version)#g" docs/version.asciidoc
 
-##############################################################################
-# Kibana synchronisation.
-##############################################################################
-
-.PHONY: are-kibana-objects-updated
-are-kibana-objects-updated: $(PYTHON) build/index-pattern.json
-	@$(PYTHON) ./script/are_kibana_saved_objects_updated.py --branch ${BEATS_VERSION} build/index-pattern.json
-build/index-pattern.json: $(PYTHON) apm-server
-	@./apm-server --strict.perms=false export index-pattern > $@
-
 ##############################################################################
 # Linting, style-checking, license header checks, etc.
 ##############################################################################

RELEASES.md

@@ -11,14 +11,6 @@
 
   run `make update-beats` in the branch from which the new branch will be created before FF to recognize potential issues
 
-* Update Kibana Index Pattern
-
-  If fields are not up to date, perform the following and open a PR:
-  * Fork and locally clone kibana
-  * Ensure that your copy of kibana has the current release branch from elastic/kibana
-  * From the apm-server repo run:
-    `make update && script/update_kibana_objects.py -d path/to/your/kibana -b $release_branch`
-
 * Update Changelog
 
   * Review existing [changelogs/head](https://github.com/elastic/apm-server/tree/master/changelogs/head.asciidoc) to ensure all relevant notes have been added