Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dashboard links in Add Data UI #30860

Merged
merged 2 commits into from
Feb 13, 2019
+29 −29
Merged

Fix dashboard links in Add Data UI #30860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84074e1
Fix dashboard links in Add Data UI
kaiyan-sheng Feb 12, 2019
3c8912a
Fix dashboard links in logging add data ui
kaiyan-sheng Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/legacy/core_plugins/kibana/server/tutorials/apache_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category';
import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions';

export function apacheLogsSpecProvider(server, context) {
const moduleName = 'apache2';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruflin when I'm fixing the links, I saw this. Should this be apache instead of apache2?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, this should be apache.

const moduleName = 'apache';
const geoipRequired = true;
const uaRequired = true;
const platforms = ['OSX', 'DEB', 'RPM', 'WINDOWS'];
Expand All @@ -36,25 +36,25 @@ export function apacheLogsSpecProvider(server, context) {
defaultMessage: 'Collect and parse access and error logs created by the Apache HTTP server.',
}),
longDescription: i18n.translate('kbn.server.tutorials.apacheLogs.longDescription', {
defaultMessage: 'The apache2 Filebeat module parses access and error logs created by the Apache 2 HTTP server. \
defaultMessage: 'The apache Filebeat module parses access and error logs created by the Apache HTTP server. \
[Learn more]({learnMoreLink}).',
values: {
learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-apache2.html',
learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-apache.html',
},
}),
euiIconType: 'logoApache',
artifacts: {
dashboards: [
{
id: 'Filebeat-Apache2-Dashboard',
id: 'Filebeat-Apache-Dashboard-ecs',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check if we renamed the ID in the Beats repo for the dashboard?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruflin Yeah I tested this and it works, also found the id name in filebeat https://github.com/elastic/beats/blob/master/filebeat/module/apache/_meta/kibana/7/dashboard/Filebeat-apache.json#L647

linkLabel: i18n.translate('kbn.server.tutorials.apacheLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Apache2 logs dashboard',
defaultMessage: 'Apache logs dashboard',
}),
isOverview: true
}
],
exportedFields: {
documentationUrl: '{config.docs.beats.filebeat}/exported-fields-apache2.html'
documentationUrl: '{config.docs.beats.filebeat}/exported-fields-apache.html'
}
},
completionTimeMinutes: 10,
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/apache_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function apacheMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'Metricbeat-Apache-HTTPD-server-status',
id: 'Metricbeat-Apache-HTTPD-server-status-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.apacheMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Apache metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/aws_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function awsMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'c5846400-f7fb-11e8-af03-c999c9dea608',
id: 'c5846400-f7fb-11e8-af03-c999c9dea608-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.awsMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'AWS metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/docker_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function dockerMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'AV4REOpp5NkDleZmzKkE',
id: 'AV4REOpp5NkDleZmzKkE-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.dockerMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Docker metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/golang_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function golangMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'f2dc7320-f519-11e6-a3c9-9d1f7c42b045',
id: 'f2dc7320-f519-11e6-a3c9-9d1f7c42b045-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.golangMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Golang metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/iis_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function iisLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '4278ad30-fe16-11e7-a3b0-d13028918f9f',
id: '4278ad30-fe16-11e7-a3b0-d13028918f9f-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.iisLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'IIS logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/kafka_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function kafkaLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '943caca0-87ee-11e7-ad9c-db80de0bf8d3',
id: '943caca0-87ee-11e7-ad9c-db80de0bf8d3-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.kafkaLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Kafka logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function kubernetesMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'AV4RGUqo5NkDleZmzKuZ',
id: 'AV4RGUqo5NkDleZmzKuZ-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Kubernetes metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/logstash_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function logstashLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'Filebeat-Logstash-Log-Dashboard',
id: 'Filebeat-Logstash-Log-Dashboard-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.logstashLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Logstash logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/mongodb_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function mongodbMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'Metricbeat-MongoDB',
id: 'Metricbeat-MongoDB-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'MongoDB metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/mssql_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function mssqlMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'a2ead240-18bb-11e9-9836-f37dedd3b411',
id: 'a2ead240-18bb-11e9-9836-f37dedd3b411-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Microsoft SQL Server metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/mysql_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function mysqlLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'Filebeat-MySQL-Dashboard',
id: 'Filebeat-MySQL-Dashboard-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.mysqlLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'MySQL logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/mysql_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function mysqlMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '66881e90-0006-11e7-bf7f-c9acc3d3e306',
id: '66881e90-0006-11e7-bf7f-c9acc3d3e306-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'MySQL metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/nginx_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function nginxLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '55a9e6e0-a29e-11e7-928f-5dbe6f6f5519',
id: '55a9e6e0-a29e-11e7-928f-5dbe6f6f5519-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.nginxLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Nginx logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/nginx_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ which must be enabled in your Nginx installation. \
artifacts: {
dashboards: [
{
id: '023d2930-f1a5-11e7-a9ef-93c69af7b129',
id: '023d2930-f1a5-11e7-a9ef-93c69af7b129-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.nginxMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Nginx metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/osquery_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function osqueryLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '69f5ae20-eb02-11e7-8f04-51231daa5b05',
id: '69f5ae20-eb02-11e7-8f04-51231daa5b05-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.osqueryLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Osquery logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/postgresql_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function postgresqlLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '158be870-87f4-11e7-ad9c-db80de0bf8d3',
id: '158be870-87f4-11e7-ad9c-db80de0bf8d3-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'PostgreSQL logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/rabbitmq_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function rabbitmqMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'AV4YobKIge1VCbKU_qVo',
id: 'AV4YobKIge1VCbKU_qVo-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'RabbitMQ metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/redis_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Note that the `slowlog` fileset is experimental. \
artifacts: {
dashboards: [
{
id: '7fea2930-478e-11e7-b1f0-cb29bac6bf8b',
id: '7fea2930-478e-11e7-b1f0-cb29bac6bf8b-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.redisLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Redis logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/redis_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function redisMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'AV4YjZ5pux-M-tCAunxK',
id: 'AV4YjZ5pux-M-tCAunxK-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.redisMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'Redis metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/system_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Unix/Linux based distributions. This module is not available on Windows. \
artifacts: {
dashboards: [
{
id: 'Filebeat-syslog-dashboard',
id: 'Filebeat-syslog-dashboard-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.systemLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'System logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/system_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ It collects system wide statistics and statistics per process and filesystem. \
artifacts: {
dashboards: [
{
id: 'Metricbeat-system-overview',
id: 'Metricbeat-system-overview-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.systemMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'System metrics dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/traefik_logs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function traefikLogsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: 'Filebeat-Traefik-Dashboard',
id: 'Filebeat-Traefik-Dashboard-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.traefikLogs.artifacts.dashboards.linkLabel', {
defaultMessage: 'Traefik logs dashboard',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/server/tutorials/uwsgi_metrics/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function uwsgiMetricsSpecProvider(server, context) {
artifacts: {
dashboards: [
{
id: '32fca290-f0af-11e7-b9ff-9f96241065de',
id: '32fca290-f0af-11e7-b9ff-9f96241065de-ecs',
linkLabel: i18n.translate('kbn.server.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel', {
defaultMessage: 'uWSGI metrics dashboard',
}),
Expand Down