From f6ba6961c333a22366a86369e483407c9c56d174 Mon Sep 17 00:00:00 2001 From: Maryia Lapata Date: Sun, 21 Oct 2018 15:39:15 +0300 Subject: [PATCH 1/4] Fix broken link on Watcher (#24317) --- .../watch_edit_detail/watch_edit_detail.html | 22 ++++++++++++++----- .../watch_edit_detail/watch_edit_detail.js | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html b/x-pack/plugins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html index 6f9263234513ec6..9e114ef004ba4ac 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/watch_edit_detail/watch_edit_detail.html @@ -50,12 +50,22 @@
- + { this.updateIsValid(); }); - this.syntaxLinkLabel = i18n('xpack.watcher.sections.watchEdit.detail.syntaxLinkLabel', { defaultMessage: 'Syntax' }); + this.documentationLinks = documentationLinks; } From 98f7667847cf0a7307cc8e4f6378090f6c0aecc3 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Mon, 22 Oct 2018 08:54:46 +0800 Subject: [PATCH 2/4] [APM] Update Go agent instructions (#24111) - Update the Go agent instructions to refer to the new import path. - Change some of the wording to align with other agents. - Drop "beta" warning. --- .../tutorials/apm/apm_client_instructions.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 index 138bebdc5799854..668e81088424da1 100644 --- 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' }, }), }, From 3ca223154908246a02fbd4a1b3c812986a645cf6 Mon Sep 17 00:00:00 2001 From: markharwood Date: Mon, 22 Oct 2018 09:27:17 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Remove=20=E2=80=9Cstep=E2=80=9D=20property?= =?UTF-8?q?=20which=20makes=20values=20other=20than=201,=201001,=202001=20?= =?UTF-8?q?etc=20illegal=20(#23610)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #22054 --- x-pack/plugins/graph/public/templates/settings.html | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugins/graph/public/templates/settings.html b/x-pack/plugins/graph/public/templates/settings.html index 7b1f50d94a9d653..225c08692bed70a 100644 --- 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" > From 77394104ce180b63e05736fc52f8c6f7150e484b Mon Sep 17 00:00:00 2001 From: markharwood Date: Mon, 22 Oct 2018 09:30:16 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Graph=20fix:=20Remove=20=E2=80=9Cstep?= =?UTF-8?q?=E2=80=9D=20property=20which=20makes=20values=20other=20than=20?= =?UTF-8?q?1,=201001,=202001=20etc=20illegal=20(#23610)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #22054