mirror of
https://github.com/status-im/consul.git
synced 2025-01-23 03:59:18 +00:00
03a1a86dfe
* v3.20.2...v3.24.0 * Fix handle undefined outlet in route component * Don't use template helper for optional modal.open Using the optional-helper here will trigger a computation in the same runloop error. This is because we are setting the `modal`-property when the `<Ref>` component gets rendered which will update the `this.modal`-property which will then recompute the `optional`-helper leading to this error. Instead we will create an action that will call the `open`-method on the modal when it is defined. This gets rid of the double computation error as we will not access the modal property twice in the same runloop when `modal` is getting set. * Fix - fn needs to be passed function tab-nav We create functions in the component file instead so that fn-helper stops complaining about the need to pass a function. * Update ember-exam to 6.1 version "Makes it compatible" with ember-qunit v5 * scheduleOnce setMaxHeight paged-collection We need to schedule to get around double-computation error. * Fix - model.data is removed from ember-data This has been private API all along - we need to work around the removal. Reference: https://github.com/emberjs/data/pull/7338/files#diff-9a8746fc5c86fd57e6122f00fef3155f76f0f3003a24b53fb7c4621d95dcd9bfL1310 * Fix `propContains` instead of `deepEqual` policy Recent model.data works differently than iterating attributes. We use `propContains` instead of `deepEqual`. We are only interested in the properties we assert against and match the previous behavior with this change. * Fix `propContains` instead of `deepEqual` token * Better handling single-records repo test-helper `model.data` has been removed we need to handle proxies and model instances differently. * Fix remaining repository tests with propContains We don't want to match entire objects - we don't care about properties we haven't defined in the assertion. * Don't use template helper for optional modal.open Using a template helper will give us a recomputation error - we work around it by creating an explicit action on the component instead. * Await `I $verb the $pageObject object` step * Fix no more customization ember-can No need to customize, the helper handles destruction fine on its own. * Fix - don't pass `optional` functions to fn We will declare the functions on the component instead. This gives us the same behavior but no error from `fn`, which expects a function to be passed. * Fix - handle `undefined` state on validate modifier StateChart can yield out an undefined `state` we need to handle that in the validate modifier * Fix linting errors tests directory * Warn / turn off new ember linting issues We will tackle them one by one and don't want to autofix issues that could be dangerous to auto-fix. * Auto-fix linting issues * More linting configuration * Fix remaining linting issues * Fix linting issues new files after rebase * ui: Remove ember-cli-uglify config now we are using terser (#14574) Co-authored-by: John Cowen <johncowen@users.noreply.github.com>
104 lines
3.2 KiB
JavaScript
104 lines
3.2 KiB
JavaScript
import { inject as service } from '@ember/service';
|
|
import RepositoryService from 'consul-ui/services/repository';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
// CONSUL_METRICS_POLL_INTERVAL controls how long between each poll to the
|
|
// metrics provider
|
|
export default class MetricsService extends RepositoryService {
|
|
@service('ui-config') config;
|
|
@service('env') env;
|
|
@service('client/http') client;
|
|
|
|
error = null;
|
|
|
|
getModelName() {
|
|
return 'metrics';
|
|
}
|
|
|
|
init() {
|
|
super.init(...arguments);
|
|
// TODO: this flow should be be async, then can just use either get or a DataSource
|
|
const config = this.config.getSync();
|
|
// Inject whether or not the proxy is enabled as an option into the opaque
|
|
// JSON options the user provided.
|
|
const opts = config.metrics_provider_options || {};
|
|
opts.metrics_proxy_enabled = config.metrics_proxy_enabled;
|
|
// Inject the base app URL
|
|
const provider = config.metrics_provider || 'prometheus';
|
|
// Inject a convenience function for dialing through the metrics proxy.
|
|
opts.fetch = (path, params) =>
|
|
this.client.fetchWithToken(`/v1/internal/ui/metrics-proxy${path}`, params);
|
|
|
|
try {
|
|
this.provider = window.consul.getMetricsProvider(provider, opts);
|
|
} catch (e) {
|
|
this.error = new Error(`metrics provider not initialized: ${e}`);
|
|
// Show the user the error once for debugging their provider outside UI
|
|
// Dev.
|
|
console.error(this.error); // eslint-disable-line no-console
|
|
}
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/metrics/summary-for-service/:slug/:protocol')
|
|
findServiceSummary(params, configuration = {}) {
|
|
if (this.error) {
|
|
return Promise.reject(this.error);
|
|
}
|
|
const promises = [
|
|
this.provider.serviceRecentSummarySeries(
|
|
params.slug,
|
|
params.dc,
|
|
params.ns,
|
|
params.protocol,
|
|
{}
|
|
),
|
|
this.provider.serviceRecentSummaryStats(
|
|
params.slug,
|
|
params.dc,
|
|
params.ns,
|
|
params.protocol,
|
|
{}
|
|
),
|
|
];
|
|
return Promise.all(promises).then((results) => {
|
|
return {
|
|
meta: {
|
|
interval: this.env.var('CONSUL_METRICS_POLL_INTERVAL') || 10000,
|
|
},
|
|
series: results[0],
|
|
stats: results[1].stats,
|
|
};
|
|
});
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/metrics/upstream-summary-for-service/:slug/:protocol')
|
|
findUpstreamSummary(params, configuration = {}) {
|
|
if (this.error) {
|
|
return Promise.reject(this.error);
|
|
}
|
|
return this.provider
|
|
.upstreamRecentSummaryStats(params.slug, params.dc, params.ns, {})
|
|
.then((result) => {
|
|
result.meta = {
|
|
interval: this.env.var('CONSUL_METRICS_POLL_INTERVAL') || 10000,
|
|
};
|
|
return result;
|
|
});
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/metrics/downstream-summary-for-service/:slug/:protocol')
|
|
findDownstreamSummary(params, configuration = {}) {
|
|
if (this.error) {
|
|
return Promise.reject(this.error);
|
|
}
|
|
return this.provider
|
|
.downstreamRecentSummaryStats(params.slug, params.dc, params.ns, {})
|
|
.then((result) => {
|
|
result.meta = {
|
|
interval: this.env.var('CONSUL_METRICS_POLL_INTERVAL') || 10000,
|
|
};
|
|
return result;
|
|
});
|
|
}
|
|
}
|