Skip to content

Commit

Permalink
Merge branch 'EMT-401_add_policy_data_to_metadata' of github.com:nnam…
Browse files Browse the repository at this point in the history
…difrankie/kibana into EMT-401_add_policy_data_to_metadata
  • Loading branch information
nnamdifrankie committed Jun 11, 2020
2 parents dfe0bcc + 48df79e commit d5bdfa5
Show file tree
Hide file tree
Showing 70 changed files with 387 additions and 357 deletions.
1 change: 1 addition & 0 deletions .sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ files:
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
- 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
- 'x-pack/plugins/security/**/*.s+(a|c)ss'
- 'x-pack/plugins/monitoring/**/*.s+(a|c)ss'
ignore:
- 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
rules:
Expand Down
2 changes: 0 additions & 2 deletions docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ include::accessibility.asciidoc[]

include::limitations.asciidoc[]

include::release-notes/highlights.asciidoc[]

include::migration.asciidoc[]

include::CHANGELOG.asciidoc[]
Expand Down
2 changes: 1 addition & 1 deletion docs/migration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ your application from one version of Kibana to another.

* <<breaking-changes-8.0>>

See also <<release-highlights>> and <<release-notes>>.
See also <<whats-new>> and <<release-notes>>.
--

include::migration/migrate_8_0.asciidoc[]
2 changes: 1 addition & 1 deletion docs/migration/migrate_8_0.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ your application to Kibana 8.0.

coming[8.0.0]

See also <<release-highlights>> and <<release-notes>>.
See also <<whats-new>> and <<release-notes>>.

* <<breaking_80_index_pattern_changes>>
* <<breaking_80_setting_changes>>
Expand Down
13 changes: 0 additions & 13 deletions docs/release-notes/highlights.asciidoc

This file was deleted.

6 changes: 4 additions & 2 deletions docs/setup/docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,16 @@ services:
[[environment-variable-config]]
==== Environment variable configuration

Under Docker, Kibana can be configured via environment variables. When
Under Docker, {kib} can be configured via environment variables. When
the container starts, a helper process checks the environment for variables that
can be mapped to Kibana command-line arguments.

For compatibility with container orchestration systems, these
environment variables are written in all capitals, with underscores as
word separators. The helper translates these names to valid
Kibana setting names.
{kib} setting names.

WARNING: All information that you include in environment variables is visible through the `ps` command, including sensitive information.

Some example translations are shown here:

Expand Down
2 changes: 2 additions & 0 deletions docs/user/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
include::introduction.asciidoc[]

include::whats-new.asciidoc[]

include::getting-started.asciidoc[]

include::setup.asciidoc[]
Expand Down
14 changes: 14 additions & 0 deletions docs/user/whats-new.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[whats-new]]
== What's new in 8.0

This section summarizes the most important changes in each release. For the
full list, see <<release-notes>> and <<breaking-changes>>.

coming[8.0.0]

//NOTE: The notable-highlights tagged regions are re-used in the
//Installation and Upgrade Guide

// tag::notable-highlights[]

// end::notable-highlights[]
24 changes: 0 additions & 24 deletions x-pack/plugins/monitoring/public/_hacks.scss

This file was deleted.

2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/public/angular/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { localAppModule, appModuleName } from './app_modules';

import { MonitoringPluginDependencies } from '../types';

const APP_WRAPPER_CLASS = 'monitoringApplicationWrapper';
const APP_WRAPPER_CLASS = 'monApplicationWrapper';
export class AngularApp {
private injector?: angular.auto.IInjectorService;

Expand Down
97 changes: 0 additions & 97 deletions x-pack/plugins/monitoring/public/components/chart/_chart.scss

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { includes, isFunction } from 'lodash';
import { EuiFlexItem, EuiFlexGroup, EuiIcon, EuiKeyboardAccessible } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import './horizontal_legend.scss';

export class HorizontalLegend extends React.Component {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.monRhythmChart__legendItem {
font-size: $euiFontSizeXS;
cursor: pointer;
color: $euiTextColor;
display: flex;
flex-direction: row;
align-items: center;

&-isDisabled {
opacity: .5;
}
}

.monRhythmChart__legendHorizontal {
margin-top: $euiSizeXS;
}

.monRhythmChart__legendLabel {
overflow: hidden;
white-space: nowrap;
display: flex;
flex-direction: row;
align-items: center;
}

.monRhythmChart__legendValue {
overflow: hidden;
white-space: nowrap;
margin-left: $euiSizeXS;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import './info_tooltip.scss';

export function InfoTooltip({ series, bucketSize }) {
const tableRows = series.map((item, index) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.monChart__tooltipLabel,
.monChart__tooltipValue {
text-align: left;
font-size: $euiFontSizeXS;
padding: $euiSizeXS;
word-wrap: break-word;
white-space: normal;
}

.monChart__tooltipLabel {
font-weight: $euiFontWeightBold;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { getTitle } from './get_title';
import { getUnits } from './get_units';
import { MonitoringTimeseries } from './monitoring_timeseries';
import { InfoTooltip } from './info_tooltip';
import './monitoring_timeseries_container.scss';

import {
EuiIconTip,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.monRhythmChart__wrapper .monRhythmChart__zoom {
visibility: hidden;
padding-right: $euiSizeM;
}

.monRhythmChart__wrapper:hover .monRhythmChart__zoom {
visibility: visible;
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { TimeseriesContainer } from './timeseries_container';
import { HorizontalLegend } from './horizontal_legend';
import { getValuesForSeriesIndex, getValuesByX } from './get_values_for_legend';
import { DEBOUNCE_SLOW_MS } from '../../../common/constants';
import './timeseries_visualization.scss';

export class TimeseriesVisualization extends React.Component {
constructor(props) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.monRhythmChart {
position: relative;
display: flex;
flex-direction: column;
flex: 1 0 auto;
}

.monRhythmChart__content {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: flex;
flex: 1 0 auto;
}

@mixin monitoringNoUserSelect {
user-select: none;
}

.monRhythmChart__visualization {
display: flex;
flex-direction: column;
flex: 1 0 auto;
position: relative;

// SASSTODO: generic selector
& > div {
min-width: 1px;
width: 100%;
height: 100%;
}

// SASSTODO: generic selector
div {
@include monitoringNoUserSelect;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
import './listing.scss';

const IsClusterSupported = ({ isSupported, children }) => {
return isSupported ? children : '-';
Expand Down Expand Up @@ -191,7 +192,7 @@ const getColumns = (
if (!licenseType) {
return (
<div>
<div className="monTableCell__clusterCellLiscense">N/A</div>
<div className="monTableCell__clusterCellLicense">N/A</div>
</div>
);
}
Expand All @@ -209,7 +210,7 @@ const getColumns = (

return (
<div>
<div className="monTableCell__clusterCellLiscense">{capitalize(licenseType)}</div>
<div className="monTableCell__clusterCellLicense">{capitalize(licenseType)}</div>
<div className="monTableCell__clusterCellExpiration">
{showLicenseExpiration ? licenseExpiry() : null}
</div>
Expand Down
Loading

0 comments on commit d5bdfa5

Please sign in to comment.