mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

codemirror-promql: fix the way to verify if it's a prometheusClient (#11018)

Browse source 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
This commit is contained in:
Augustin Husson 2022-07-14 16:28:10 +02:00 committed by GitHub
parent cf0fdd557e
commit 1ba2bbc5fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
web/ui/module/codemirror-promql/src/complete/index.test.ts Normal file
View file

@ -0,0 +1,27 @@
// Copyright 2022 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { isPrometheusClient } from './index';
import { HTTPPrometheusClient } from '../client/prometheus';
describe('type of remoteConfig', () => {
it('should be a prometheusClient', () => {
const client = new HTTPPrometheusClient({});
expect(isPrometheusClient(client)).toBe(true);
});
it('should be a remote config', () => {
const remote = { url: 'https://prometheus.io' };
expect(isPrometheusClient(remote)).toBe(false);
});
});

18
web/ui/module/codemirror-promql/src/complete/index.ts
View file

@ -31,16 +31,14 @@ export interface CompleteConfiguration {
completeStrategy?: CompleteStrategy;
}
function isPrometheusConfig(remoteConfig: PrometheusConfig | PrometheusClient): remoteConfig is PrometheusConfig {
const cfg = remoteConfig as PrometheusConfig;
export function isPrometheusClient(remoteConfig: PrometheusConfig | PrometheusClient): remoteConfig is PrometheusClient {
const client = remoteConfig as PrometheusClient;
return (
cfg.url !== undefined ||
cfg.lookbackInterval !== undefined ||
cfg.httpErrorHandler !== undefined ||
cfg.fetchFn !== undefined ||
cfg.cache !== undefined ||
cfg.httpMethod !== undefined ||
cfg.apiPrefix !== undefined
typeof client.labelNames === 'function' &&
typeof client.labelValues === 'function' &&
typeof client.metricMetadata === 'function' &&
typeof client.series === 'function' &&
typeof client.metricNames === 'function'
);
}
@ -49,7 +47,7 @@ export function newCompleteStrategy(conf?: CompleteConfiguration): CompleteStrat
return conf.completeStrategy;
}
if (conf?.remote) {
if (!isPrometheusConfig(conf.remote)) {
if (isPrometheusClient(conf.remote)) {
return new HybridComplete(conf.remote, conf.maxMetricsMetadata);
}
return new HybridComplete(new CachedPrometheusClient(new HTTPPrometheusClient(conf.remote), conf.remote.cache), conf.maxMetricsMetadata);