+
-
+
+
Queue metrics not available
-
+
);
}
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement.js
index eb25609905dbc..545c7934db8e0 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement.js
@@ -6,7 +6,6 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { EuiFlexGroup } from '@elastic/eui';
import { PluginStatement as PluginStatementModel } from '../../models/pipeline/plugin_statement';
import { CollapsibleStatement } from './collapsible_statement';
import { IfElement } from '../../models/list/if_element';
@@ -15,7 +14,7 @@ import { PluginStatement } from './plugin_statement';
function renderNestingSpacers(depth) {
const spacers = [];
for (let i = 0; i < depth; i += 1) {
- spacers.push(
);
+ spacers.push(
);
}
return spacers;
}
@@ -53,28 +52,15 @@ function renderStatement({
);
}
-function getTopLevelStatementPadding(depth) {
- return depth === 0
- ? { paddingLeft: '0px' }
- : null;
-}
-
export function Statement(props) {
const { depth } = props.element;
return (
-
-
+
+
{renderNestingSpacers(depth)}
-
-
- {renderStatement(props)}
-
-
+ {renderStatement(props)}
);
}
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_list_heading.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_list_heading.js
index 66686871ef088..18ae8c3277a47 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_list_heading.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_list_heading.js
@@ -21,16 +21,15 @@ export function StatementListHeading({
-
+
{title}
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_section.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_section.js
index dc22ab1ca2514..d402b63a89f58 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_section.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/config_viewer/statement_section.js
@@ -8,6 +8,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { StatementListHeading } from './statement_list_heading';
import { Statement } from './statement';
+import { EuiSpacer } from '@elastic/eui';
export function StatementSection({
iconType,
@@ -18,11 +19,12 @@ export function StatementSection({
if (!elements.length) { return null; }
return (
-
+
+
+
{
elements.map(this.renderStatement)
}
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
index c384802c4f45c..b1b5d70827f2b 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
@@ -20,7 +20,8 @@ import {
EuiFlexGroup,
EuiFlexItem,
EuiButtonIcon,
- EuiSpacer
+ EuiSpacer,
+ EuiBadge,
} from '@elastic/eui';
import { Sparkline } from '../../../sparkline';
import { formatMetric } from '../../../../lib/format_number';
@@ -189,7 +190,7 @@ function renderBasicStats(vertex, timeseriesTooltipXValueFormatter) {
function renderPluginBasicInfo(vertex) {
if (vertex.hasExplicitId) {
return (
- This {vertex.typeString}'s ID is { vertex.id }.
+ This {vertex.typeString}'s ID is { vertex.id }.
);
}
@@ -268,17 +269,22 @@ export function DetailDrawer({ vertex, onHide, timeseriesTooltipXValueFormatter
>
+
+ { renderIcon(vertex) }
+
- { renderIcon(vertex) }{ renderTitle(vertex) }
+ { renderTitle(vertex) }
diff --git a/x-pack/plugins/monitoring/public/less/components/logstash/config_viewer.less b/x-pack/plugins/monitoring/public/less/components/logstash/config_viewer.less
index 2296d77c28522..b811711871d9c 100644
--- a/x-pack/plugins/monitoring/public/less/components/logstash/config_viewer.less
+++ b/x-pack/plugins/monitoring/public/less/components/logstash/config_viewer.less
@@ -1,133 +1,100 @@
-.cv-statementList
-{
- margin: 16px;
-}
-
-.cv-statementList__icon
-{
- margin-top: 5px;
-}
-
-.cv-spacer {
- height: 94%;
- width: 10px;
- display: inline-block;
- margin-left: 11px;
- border-left: 1px #b2b2b2 dashed;
-}
-
-@media (max-width: 768px) {
- .cv-spacer {
- border: 0px;
- }
-}
+@import (reference) '~ui/styles/variables/colors';
-.cv-spacer:last-child {
- width: 0px;
+monitoring-main[page="pipeline"] {
+ background: @globalColorLightestGray;
}
-.cv-inputMetric__eventsEmitted {
- width: 150px;
+.configViewer {
+ max-width: 1000px;
}
-.cv-statement__content {
- display: inline-block;
- min-height: 28px;
- padding-left: 9px;
- width: 100%;
+.configViewer__statement {
+ padding-left: 12px;
}
-.cv-statement {
- display: inline-block;
- margin-top: 5px;
- margin-left: 3px;
- width: 100%;
+.configViewer__plugin {
+ margin-left: 4px;
}
-.cv-statement__id {
- background: #d9d9d9;
- padding: 4px 6px 4px 6px;
- font-size: 12px;
- font-weight: bold;
- border-radius: 2px;
- margin-top: 1px;
-}
-.cv-statement__icon {
- color: #50b0a4;
-}
-
-.cv-statement__name {
- color: #50b0a4;
- font-weight: bold;
- font-size: small;
- margin-top: -2px;
+.configViewer__spaceContainer {
+ background-color: white;
+ align-self: stretch;
+ display: flex;
+ // Separates the left border spaces properly
+ border-bottom: solid 2px white;
}
-.cv-ifStatement__condition {
- margin-top: 7px;
-}
+.configViewer__spacer {
+ width: 12px;
+ align-self: stretch;
+ margin-left: 12px;
+ border-left: 1px @globalColorMediumGray dashed;
-.cv-pluginStatement__icon {
- padding-top: 4px;
-}
+ // This allows the border to be flush
+ &:last-child {
+ width: 0px;
+ }
-.cv-pluginStatement__metricContainer {
- padding: 4px 8px 4px 8px;
- border-radius: 2px;
+ &:first-child {
+ // Odd number is because of the single pixel border.
+ margin-left: 23px;
+ }
}
-.cv-processorMetric__cpuTime {
- width: 35px;
- padding: 2px 4px 2px 8px;
- border-radius: 2px;
- margin-top: -2px;
-}
-.cv-processorMetric__cpuTimeHighlight {
- background: #d6b283;
-}
+.configViewer__metric {
+ text-align: right;
-.cv-processorMetric__events {
- width: 150px;
- border-radius: 2px;
- padding: 2px 4px 2px 4px;
- margin-top: -2px;
-}
-
-.cv-processorMetric__eventMillis {
- width: 80px;
- padding: 2px 4px 2px 4px;
- margin-top: -2px;
-}
+ &--cputTime {
+ width: 40px;
+ }
-.cv-spaceContainer {
- background-color: white;
-}
+ &--events, &--eventsEmitted {
+ width: 160px;
+ }
-.cv-queue__messageText {
- margin-left: 25px;
- color: #838383;
+ &--eventMillis {
+ width: 80px;
+ }
}
-.cv-list {
- display: flex;
- min-height: 32px;
+.configViewer__queueMessage {
+ margin-left: 24px;
+ color: @globalColorDarkGray;
}
-.cv-listParent li:nth-child(2n+1) {
- background: #f7f7f7;
-}
+.configViewer__list {
+ .configViewer__listItem {
+ display: flex;
+ min-height: 32px;
+ align-items: center;
+ padding-right: 12px;
-.cv-ifElseStatement__title {
- margin-top: 2px;
+ &:nth-child(2n+1) {
+ background: #fafafa;
+ }
+ }
}
-.cv-ifElseStatement__name {
+.configViewer__conditional {
font-weight: bold;
+ text-transform: uppercase;
}
-.cv-ifElseStatement__toggle {
- margin-top: 3px;
- color: #898989;
+@media (max-width: 768px) {
+ .configViewer {
+ .configViewer__spacer {
+ border: none;
+ }
+
+ .configViewer__metricFlexItem {
+ margin-bottom: 4px !important;
+ }
+
+ .configViewer__metric {
+ text-align: left;
+ padding-left: 32px;
+ }
+ }
}