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.

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

Feature/translate monitoring server(part_2) #25402

Merged
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c7ec189
Merge pull request #1 from elastic/master
Nox911 Sep 24, 2018
fa01b88
Merge pull request #2 from elastic/master
Nox911 Sep 27, 2018
70f6c7e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 27, 2018
68587a0
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 28, 2018
42aa7d3
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
efeaefe
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
8a054ed
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 8, 2018
b0d1660
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 16, 2018
62b6ad1
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 17, 2018
acbad4b
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 18, 2018
a850650
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 22, 2018
0a200ce
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 25, 2018
b2a8244
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 29, 2018
b4b979e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 30, 2018
d349a4f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 31, 2018
ae285b9
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 2, 2018
3051641
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 5, 2018
f9ac566
Translate monitoring -> server -> metrics
Nox911 Nov 8, 2018
c3f9c6a
Add monitooring path to i18nrx.json file
Nox911 Nov 8, 2018
2b2e278
Fix issues
Nox911 Nov 9, 2018
71da47b
Merge branch 'master' into feature/translate-monitoring-server(part_2)
maryia-lapata Nov 13, 2018
aebdd80
Remove eslint rule disabling
maryia-lapata Nov 13, 2018
cb5fc4b
Merge branch 'master' into feature/translate-monitoring-server(part_2)
maryia-lapata Nov 14, 2018
d680848
Merge branch 'master' into feature/translate-monitoring-server(part_2)
maryia-lapata Nov 21, 2018
aa7455e
Merge branch 'master' into feature/translate-monitoring-server(part_2)
maryia-lapata Nov 23, 2018
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
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"xpack.grokDebugger": "x-pack/plugins/grokdebugger",
"xpack.idxMgmt": "x-pack/plugins/index_management",
"xpack.licenseMgmt": "x-pack/plugins/license_management",
"xpack.monitoring": "x-pack/plugins/monitoring",
"xpack.rollupJobs": "x-pack/plugins/rollup",
"xpack.searchProfiler": "x-pack/plugins/searchprofiler",
"xpack.security": "x-pack/plugins/security",
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/monitoring/server/lib/metrics/apm/classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import { ClusterMetric, Metric } from '../classes';
import { SMALL_FLOAT, LARGE_FLOAT } from '../../../../common/formatting';
import { i18n } from '@kbn/i18n';

export class ApmClusterMetric extends ClusterMetric {
constructor(opts) {
Expand Down Expand Up @@ -83,7 +84,9 @@ export class ApmEventsRateClusterMetric extends ApmClusterMetric {
derivative: true,
format: LARGE_FLOAT,
metricAgg: 'max',
units: '/m'
units: i18n.translate('xpack.monitoring.metrics.apm.perMinuteUnitLabel', {
defaultMessage: '/m'
})
});

this.aggs = {
Expand Down
356 changes: 263 additions & 93 deletions x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions x-pack/plugins/monitoring/server/lib/metrics/beats/classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ import {
LARGE_BYTES
} from '../../../../common/formatting';
import { NORMALIZED_DERIVATIVE_UNIT } from '../../../../common/constants';
import { i18n } from '@kbn/i18n';

const perSecondUnitLabel = i18n.translate('xpack.monitoring.metrics.beats.perSecondUnitLabel', {
defaultMessage: '/s'
});

export class BeatsClusterMetric extends ClusterMetric {
constructor(opts) {
Expand All @@ -36,7 +41,7 @@ export class BeatsEventsRateClusterMetric extends BeatsClusterMetric {
derivative: true,
format: LARGE_FLOAT,
metricAgg: 'max',
units: '/s'
units: perSecondUnitLabel
});

this.aggs = {
Expand Down Expand Up @@ -102,7 +107,7 @@ export class BeatsEventsRateMetric extends BeatsMetric {
...opts,
format: LARGE_FLOAT,
metricAgg: 'max',
units: '/s',
units: perSecondUnitLabel,
derivative: true
});
}
Expand All @@ -114,7 +119,7 @@ export class BeatsByteRateMetric extends BeatsMetric {
...opts,
format: LARGE_BYTES,
metricAgg: 'max',
units: '/s',
units: perSecondUnitLabel,
derivative: true
});
}
Expand Down
Loading