Merge branch 'master' into pr/24217

elastic · Oct 22, 2018 · 8af795c · 8af795c
2 parents eb84bff + 7739410
commit 8af795c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js
@@ -361,7 +361,7 @@ export const createGoClientInstructions = () => [
     textPre: i18n.translate('kbn.server.tutorials.apm.goClient.install.textPre', {
       defaultMessage: 'Install the APM agent packages for Go.',
     }),
-    commands: ['go get github.com/elastic/apm-agent-go'],
+    commands: ['go get go.elastic.co/apm'],
   },
   {
     title: i18n.translate('kbn.server.tutorials.apm.goClient.configure.title', {
@@ -384,13 +384,14 @@ file name, or the `ELASTIC_APM_SERVICE_NAME` environment variable.',
   })}
 export ELASTIC_APM_SERVICE_NAME=
 
-# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setAmpServerUrlComment', {
-    defaultMessage: 'Set the APM Server URL. If unspecified, the agent will effectively be disabled.',
+# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment', {
+    defaultMessage: 'Set custom APM Server URL (default: {defaultApmServerUrl})',
+    values: { defaultApmServerUrl: 'http://localhost:8200' },
   })}
 export ELASTIC_APM_SERVER_URL=
 
-# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setIfAmpServerRequiresTokenComment', {
-    defaultMessage: 'Set if APM Server requires a token.',
+# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment', {
+    defaultMessage: 'Use if APM Server requires a token',
   })}
 export ELASTIC_APM_SECRET_TOKEN=
 `.split('\n'),
@@ -407,11 +408,11 @@ export ELASTIC_APM_SECRET_TOKEN=
       defaultMessage: 'Instrument your Go application by using one of the provided instrumentation modules or \
 by using the tracer API directly.',
     }),
-    commands: `
+    commands: `\
 import (
 	"net/http"
 
-	"github.com/elastic/apm-agent-go/module/apmhttp"
+	"go.elastic.co/apm/module/apmhttp"
 )
 
 func main() {curlyOpen}
@@ -422,8 +423,7 @@ func main() {curlyOpen}
 `.split('\n'),
     textPost: i18n.translate('kbn.server.tutorials.apm.goClient.instrument.textPost', {
       defaultMessage: 'See the [documentation]({documentationLink}) for a detailed \
-guide to instrumenting Go source code.\n\n\
-**Warning: The Go agent is currently in Beta and not meant for production use.**',
+guide to instrumenting Go source code.',
       values: { documentationLink: '{config.docs.base_url}guide/en/apm/agent/go/current/instrumenting-source.html' },
     }),
   },

diff --git a/x-pack/plugins/graph/public/templates/settings.html b/x-pack/plugins/graph/public/templates/settings.html
@@ -277,7 +277,6 @@
           class="form-control input-sm"
           min="1"
           max="500000"
-          step="1000"
           id="qIndexSampleSize"
           ng-model="exploreControls.sampleSize"
         >

diff --git a/...ns/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html b/...ns/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html
@@ -50,12 +50,22 @@
 </form>
 
 <div class="kuiFormSection">
-  <label
-    class="kuiFormLabel"
-    i18n-id="xpack.watcher.sections.watchEdit.detail.watchJSONLabel"
-    i18n-default-message="Watch JSON({syntax})"
-    i18n-values="{ syntax: '<a href=\'{{ watchEditDetail.documentationLinks.watcher.putWatchApi }}\' target=\'_blank\' rel=\'noopener noreferrer\' data-test-subj=\'lnkPutWatchApiDoc\'>' + watchEditDetail.syntaxLinkLabel + '</a>'}"
-  ></label>
+  <label class="kuiFormLabel">
+    <span
+      i18n-id="xpack.watcher.sections.watchEdit.detail.watchJSONLabel"
+      i18n-default-message="Watch JSON"
+    ></span>
+    (
+      <a
+        href="{{ watchEditDetail.documentationLinks.watcher.putWatchApi }}"
+        target="_blank"
+        rel="noopener noreferrer"
+        data-test-subj="lnkPutWatchApiDoc"
+        i18n-id="xpack.watcher.sections.watchEdit.detail.syntaxLinkLabel"
+        i18n-default-message="Syntax"
+      ></a>
+    )
+  </label>
   <json-editor
     json="watchEditDetail.watch.watch"
     on-change="watchEditDetail.onJsonChange"

diff --git a/...gins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.js b/...gins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.js
@@ -11,7 +11,7 @@ import { documentationLinks } from 'plugins/watcher/lib/documentation_links';
 
 const app = uiModules.get('xpack/watcher');
 
-app.directive('watchEditDetail', function (i18n) {
+app.directive('watchEditDetail', function () {
   return {
     restrict: 'E',
     template: template,
@@ -36,7 +36,7 @@ app.directive('watchEditDetail', function (i18n) {
         $scope.$watch('watchEditDetail.form.$valid', () => {
           this.updateIsValid();
         });
-        this.syntaxLinkLabel = i18n('xpack.watcher.sections.watchEdit.detail.syntaxLinkLabel', { defaultMessage: 'Syntax' });
+
         this.documentationLinks = documentationLinks;
       }