Skip to content

Commit

Permalink
Merge branch 'graph/call-to-action' of github.com:flash1293/kibana in…
Browse files Browse the repository at this point in the history
…to graph/call-to-action
  • Loading branch information
flash1293 committed Sep 30, 2019
2 parents 00e59ad + a32e92a commit 7ac17cf
Show file tree
Hide file tree
Showing 123 changed files with 1,999 additions and 681 deletions.
8 changes: 6 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/groovy

library 'kibana-pipeline-library'

stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
timeout(time: 180, unit: 'MINUTES') {
timestamps {
Expand Down Expand Up @@ -246,10 +248,12 @@ def sendInfraMail() {

def sendKibanaMail() {
catchError {
if(params.NOTIFY_ON_FAILURE && currentBuild.result != 'SUCCESS' && currentBuild.result != 'ABORTED') {
def buildStatus = buildUtils.getBuildStatus()

if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
emailext(
to: 'build-kibana@elastic.co',
subject: "${env.JOB_NAME} - Build # ${env.BUILD_NUMBER} - ${currentBuild.result}",
subject: "${env.JOB_NAME} - Build # ${env.BUILD_NUMBER} - ${buildStatus}",
body: '${SCRIPT,template="groovy-html.template"}',
mimeType: 'text/html',
)
Expand Down
2 changes: 1 addition & 1 deletion docs/code/code-import-first-repo.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ xpack.code.ui.enabled: true
https://github.com/Microsoft/TypeScript-Node-Starter
----

`https` is recommend for cloning git repositories.
`https` is recommend for cloning most git repositories. To clone a private repository, <<code-repo-management, use SSH>>.

. Click *Import*.
+
Expand Down
40 changes: 31 additions & 9 deletions docs/code/code-repo-management.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,40 @@ Code starts with an overview of your repositories. You can then use the UI to a
image::images/code-repo-management.png[]

[float]
[[add-delete-a-repo]]
==== Add and delete a repo
The <<code-import-first-repo, Import your first repository>> page provides step-by-step instructions for adding a GitHub repo to *Code*. You can fine tune the hostname of the git clone URL in your `kibana.yml` file.
The <<code-import-first-repo, Import your first repository>> page provides step-by-step instructions for adding a GitHub repo to *Code*. You can fine-tune the hostname of the git clone URL in your `kibana.yml` file.

For security reasons, Code allows only a few trusted hostnames, such as github.com, by default. You can add an SSH key to {kib} to clone private repos.
For security reasons, Code allows only a few <<clone-url-management,trusted hostnames>>, such as github.com. To clone private repositories see <<clone-private-repo,add an SSH key>>.

Deleting a repo removes it from local storage and the Elasticsearch index.
To delete a repository, go to the **Repositories** tab, find the name of the repo, and click *Delete*.

[float]
==== Reindex a repo
*Code* automatically reindexes an imported repo at set intervals, but in some cases you might need to manually refresh the index. For example, you might refresh an index after a new language server is installed. Or, you might want to immediately update the index to the HEAD revision. Click *Reindex* to initiate a reindex.
[[clone-private-repo]]
==== Clone private repo with an SSH key
Clones of private repos require an SSH key for authentication. The username associated with your host must have write access to the repository you want to clone.

The following section provides links for generating your ssh key through GitHub. If you already have an SSH key added through your host, skip to step 4.

1. https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#generating-a-new-ssh-key[Generate an ssh key].

2. https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent[Add the ssh key to your ssh-agent.]

3. https://help.github.com/en/articles/adding-a-new-ssh-key-to-your-github-account[Add the ssh key to your host].

4. Copy the ssh key into `data/code/credentials/` under the {kib} folder.

In some cases you might need to manually refresh the index besides automatic indexing. For example, you might refresh an index after a new language server is installed. Or, you might want to immediately update the index to the HEAD revision. Click *Reindex* to initiate a reindex.
You can now copy private Git repositories into Code.

To delete a repository, find the go to the **Repositories** tab, find the name of the repo and click *Delete*.

[float]
[[reindex-a-repo]]
==== Reindex a repo
*Code* automatically reindexes an imported repo at set intervals, but in some cases, you might need to refresh the index manually. For example, you might refresh an index after a new language server installs. Or, you might want to update the index to the HEAD revision immediately. Click *Reindex* to initiate a reindex.

[float]
[[clone-url-management]]
==== Clone URL management
For security reasons, *Code* only allows the following hostnames in the git clone URL by default:

Expand All @@ -46,9 +66,11 @@ xpack.code.security.gitProtocolWhitelist: [ "https" ]
----

[float]
==== Clone repo with SSH key
If your repo clone requires an SSH key for authentication, put the SSH key in `data/code/credentials/` under the {kib} folder.

[[repo-limitations]]
==== Limitations
Consider the following limitations before cloning repositories:

- Only Git is supported. Other version control systems, such as Mercurial and SVN, are not supported.
- Your disk might not have enough space to clone repositories due to {kib} watermark settings. To update your watermark settings, contact your system administrator and request additional disk space.

include::code-install-lang-server.asciidoc[]
16 changes: 8 additions & 8 deletions docs/management/watcher-ui/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ With this UI, you can:
[role="screenshot"]
image:management/watcher-ui/images/watches.png["Watcher list"]

{stack-ov}/xpack-alerting.html[Alerting on cluster and index events]
{ref}/xpack-alerting.html[Alerting on cluster and index events]
is a good source for detailed
information on how watches work. If you are using the UI to create a
threshold watch, take a look at the different watcher actions. If you are
Expand Down Expand Up @@ -110,9 +110,9 @@ image:management/watcher-ui/images/threshold-alert/threshold-alert-condition.png

Now that the condition is set, you must add an action. The action triggers
when the watch condition is met. For a complete list of actions and how to configure them, see
{stack-ov}/action-conditions.html[Adding conditions to actions].
{ref}/action-conditions.html[Adding conditions to actions].

In this example, you’ll configure an email action. You must have an {stack-ov}/actions-email.html#configuring-email[email account configured]
In this example, you’ll configure an email action. You must have an {ref}/actions-email.html#configuring-email[email account configured]
in {es} for this example to work.

. Click *Add action* and select *Email*.
Expand Down Expand Up @@ -178,7 +178,7 @@ image:management/watcher-ui/images/execution-history.png["Execution history tab"
The *Action statuses* tab lists all actions associated with the watch and
the state of each action. If the action is firing, you can acknowledge the
watch to prevent too many executions of the same action for the same watch.
See {stack-ov}/actions.html#actions-ack-throttle[Acknowledgement and Throttling] for details.
See {ref}/actions.html#actions-ack-throttle[Acknowledgement and throttling] for details.

[role="screenshot"]
image:management/watcher-ui/images/alerts-status.png["Action status tab"]
Expand Down Expand Up @@ -209,7 +209,7 @@ For more information, see {ref}/query-dsl.html[Query DSL].
On the Watch overview page, click *Create* and choose *Create advanced watch*.
An advanced watch requires a name and ID. Name is a user-friendly way to
identify the watch, and ID refers to the identifier used by {es}. Refer to
{stack-ov}/how-watcher-works.html#watch-definition[Watch definition] for how
{ref}/how-watcher-works.html#watch-definition[Watch definition] for how
to input the watch JSON.

[role="screenshot"]
Expand All @@ -227,7 +227,7 @@ simulation. Be aware of these implementation details on overrides:
* Action overrides support {ref}/watcher-api-execute-watch.html#watcher-api-execute-watch-action-mode[multiple options].

After starting the simulation, you’ll see a results screen. For more information
on the fields in the response, see the {ref}//watcher-api-execute-watch.html[Execute Watch API].
on the fields in the response, see the {ref}/watcher-api-execute-watch.html[Execute watch API].

[role="screenshot"]
image:management/watcher-ui/images/advanced-watch/advanced-watch-simulate.png["Create advanced watch"]
Expand All @@ -237,8 +237,8 @@ image:management/watcher-ui/images/advanced-watch/advanced-watch-simulate.png["C

Refer to these examples for creating an advanced watch:

* {stack-ov}/watch-cluster-status.html[Watch the status of an {es} cluster]
* {stack-ov}/watching-meetup-data.html[Watch event data]
* {ref}/watch-cluster-status.html[Watch the status of an {es} cluster]
* {ref}/watching-meetup-data.html[Watch event data]



5 changes: 4 additions & 1 deletion docs/setup/upgrade/upgrade-migrations.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ The first instance that triggers saved object migrations will run the entire pro
[[upgrade-migrations-rolling-back]]
==== Rolling back to a previous version of {kib}

When rolling {kib} back to a previous version, point the `.kibana` alias to the appropriate {kib} index. When you have the previous version running again, delete the more recent `.kibana_N` index or indices so that future upgrades are based on the current {kib} index.
When rolling {kib} back to a previous version, point the `.kibana` alias to
the appropriate {kib} index. When you have the previous version running again,
delete the more recent `.kibana_N` index or indices so that future upgrades are
based on the current {kib} index. You must restart {kib} to re-trigger the migration.

WARNING: Rolling back to a previous {kib} version can result in saved object data loss if you had successfully upgraded and made changes to saved objects before rolling back.

Expand Down
2 changes: 1 addition & 1 deletion docs/user/dashboard.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ image::images/dashboard-read-only-badge.png[Example of Dashboard's read only acc
[[dashboard-getting-started]]
=== Interact with dashboards

When you open *Dashhboard*, you're presented an overview of your dashboards.
When you open *Dashboard*, you're presented an overview of your dashboards.
If you don't have any dashboards, you can add
<<add-sample-data, sample data sets>>,
which include pre-built dashboards.
Expand Down
2 changes: 1 addition & 1 deletion docs/user/monitoring/cluster-alerts.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ include::cluster-alerts-license.asciidoc[]
To receive email notifications for the Cluster Alerts:

. Configure an email account as described in
{stack-ov}/actions-email.html#configuring-email[Configuring email accounts].
{ref}/actions-email.html#configuring-email[Configuring email accounts].
. Configure the
`xpack.monitoring.cluster_alerts.email_notifications.email_address` setting in
`kibana.yml` with your email address.
Expand Down
4 changes: 2 additions & 2 deletions docs/user/monitoring/viewing-metrics.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ By default, data is retrieved from the cluster specified in the
from a different cluster, set `xpack.monitoring.elasticsearch.hosts`.

To learn more about typical monitoring architectures,
see {stack-ov}/how-monitoring-works.html[How monitoring works] and
{stack-ov}/monitoring-production.html[Monitoring in a production environment].
see {ref}/how-monitoring-works.html[How monitoring works] and
{ref}/monitoring-production.html[Monitoring in a production environment].
--

. Verify that `xpack.monitoring.ui.enabled` is set to `true`, which is the
Expand Down
4 changes: 2 additions & 2 deletions docs/user/reporting/watch-example.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ see {kibana-ref}/secure-reporting.html[Securing Reporting].

To configure a watch to email reports, you use the `reporting` attachment type
in an `email` action. For more information, see
{stack-ov}/actions-email.html#configuring-email[Configuring Email Accounts].
{ref}/actions-email.html#configuring-email[Configuring email accounts].

For example, the following watch generates a PDF report and emails the report every hour:

Expand Down Expand Up @@ -46,7 +46,7 @@ PUT _watcher/watch/error_report

<1> You must configure at least one email account to enable Watcher to send email.
For more information, see
{xpack-ref}/actions-email.html#configuring-email[Configuring Email Accounts].
{ref}/actions-email.html#configuring-email[Configuring email accounts].
<2> This is an example POST URL. You can copy and paste the URL for any
report from the Kibana UI.
<3> Optional, default is 40
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"@babel/register": "^7.5.5",
"@elastic/charts": "^12.0.2",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "14.2.0",
"@elastic/eui": "14.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
Expand Down Expand Up @@ -330,6 +330,7 @@
"@types/mustache": "^0.8.31",
"@types/node": "^10.12.27",
"@types/opn": "^5.1.0",
"@types/pngjs": "^3.3.2",
"@types/podium": "^1.0.0",
"@types/prop-types": "^15.5.3",
"@types/react": "^16.8.0",
Expand Down
31 changes: 15 additions & 16 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@
'@types/reselect',
],
},
{
groupSlug: 'moment',
groupName: 'moment related packages',
packagePatterns: [
'(\\b|_)moment(\\b|_)',
],
},
{
groupSlug: 'graphql',
groupName: 'graphql related packages',
Expand Down Expand Up @@ -465,14 +472,6 @@
'@types/mkdirp',
],
},
{
groupSlug: 'moment-timezone',
groupName: 'moment-timezone related packages',
packageNames: [
'moment-timezone',
'@types/moment-timezone',
],
},
{
groupSlug: 'mustache',
groupName: 'mustache related packages',
Expand All @@ -497,6 +496,14 @@
'@types/opn',
],
},
{
groupSlug: 'pngjs',
groupName: 'pngjs related packages',
packageNames: [
'pngjs',
'@types/pngjs',
],
},
{
groupSlug: 'podium',
groupName: 'podium related packages',
Expand Down Expand Up @@ -713,14 +720,6 @@
'@types/papaparse',
],
},
{
groupSlug: 'pngjs',
groupName: 'pngjs related packages',
packageNames: [
'pngjs',
'@types/pngjs',
],
},
{
groupSlug: 'proper-lockfile',
groupName: 'proper-lockfile related packages',
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ kibana_vars=(
xpack.monitoring.ui.container.elasticsearch.enabled
xpack.monitoring.ui.container.logstash.enabled
xpack.monitoring.ui.enabled
xpack.reporting.capture.browser.autoDownload
xpack.reporting.capture.browser.chromium.disableSandbox
xpack.reporting.capture.browser.chromium.inspect
xpack.reporting.capture.browser.chromium.maxScreenshotDimension
xpack.reporting.capture.browser.chromium.proxy.enabled
xpack.reporting.capture.browser.chromium.proxy.server
xpack.reporting.capture.browser.chromium.proxy.bypass
Expand All @@ -142,16 +145,29 @@ kibana_vars=(
xpack.reporting.capture.loadDelay
xpack.reporting.capture.settleTime
xpack.reporting.capture.timeout
xpack.reporting.capture.viewport.height
xpack.reporting.capture.viewport.width
xpack.reporting.capture.zoom
xpack.reporting.csv.checkForFormulas
xpack.reporting.csv.enablePanelActionDownload
xpack.reporting.csv.maxSizeBytes
xpack.reporting.csv.scroll.duration
xpack.reporting.csv.scroll.size
xpack.reporting.enabled
xpack.reporting.encryptionKey
xpack.reporting.index
xpack.reporting.kibanaApp
xpack.reporting.kibanaServer.hostname
xpack.reporting.kibanaServer.port
xpack.reporting.kibanaServer.protocol
xpack.reporting.poll.jobCompletionNotifier.interval
xpack.reporting.poll.jobCompletionNotifier.intervalErrorMultiplier
xpack.reporting.poll.jobsRefresh.interval
xpack.reporting.poll.jobsRefresh.intervalErrorMultiplier
xpack.reporting.queue.indexInterval
xpack.reporting.queue.pollEnabled
xpack.reporting.queue.pollInterval
xpack.reporting.queue.pollIntervalErrorMultiplier
xpack.reporting.queue.timeout
xpack.reporting.roles.allow
xpack.searchprofiler.enabled
Expand Down
24 changes: 16 additions & 8 deletions src/dev/ci_setup/extract_bootstrap_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@ if [ -f "$bootstrapCache" ]; then
echo "extracting bootstrap_cache from $bootstrapCache";
tar -xf "$bootstrapCache";
else
echo ""
echo ""
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~";
echo " bootstrap_cache missing";
echo " looked for '$bootstrapCache'";
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~";
echo ""
echo ""
branchBootstrapCache="$HOME/.kibana/bootstrap_cache/$(jq -r .branch package.json).tar"

if [ -f "$branchBootstrapCache" ]; then
echo "extracting bootstrap_cache from $branchBootstrapCache";
tar -xf "$branchBootstrapCache";
else
echo ""
echo ""
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~";
echo " bootstrap_cache missing";
echo " looked for '$bootstrapCache'";
echo " and '$branchBootstrapCache'";
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~";
echo ""
echo ""
fi
fi
5 changes: 5 additions & 0 deletions src/dev/renovate/package_groups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ export const RENOVATE_PACKAGE_GROUPS: PackageGroup[] = [
packageNames: ['ngreact', 'recompose', 'prop-types', 'typescript-fsa-reducers', 'reselect'],
},

{
name: 'moment',
packageWords: ['moment'],
},

{
name: 'graphql',
packageWords: ['graphql', 'apollo'],
Expand Down
1 change: 1 addition & 0 deletions src/legacy/core_plugins/kibana/public/discover/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
chart-data="histogramData"
timefilter-update-handler="timefilterUpdateHandler"
watch-depth="reference"
data-test-subj="discoverChart"
></discover-histogram>
</section>

Expand Down
Loading

0 comments on commit 7ac17cf

Please sign in to comment.