Add support for Prometheus api prefix (#341)

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala authored and GitHub committed 2020-05-06 20:37:32 +03:00
1 parent 5c1974f07b
commit bba6eb743d
3 files changed
+14 -4

No files matched your search

+8
View File
@@ -46,6 +46,7 @@ export type ClusterPreferences = {
namespace: string;
service: string;
port: number;
prefix: string;
};
prometheusProvider?: {
type: string;
@@ -153,6 +154,13 @@ export class Cluster implements ClusterInfo {
this.save()
}
public getPrometheusApiPrefix() {
if (!this.preferences.prometheus?.prefix) {
return ""
}
return this.preferences.prometheus.prefix
}
public save() {
clusterStore.storeCluster(this)
}
+1 -1
View File
@@ -26,7 +26,7 @@ class MetricsRoute extends LensApi {
let prometheusProvider: PrometheusProvider
try {
const prometheusPath = await cluster.contextHandler.getPrometheusPath()
metricsUrl = `${serverUrl}/api/v1/namespaces/${prometheusPath}/proxy/api/v1/query_range`
metricsUrl = `${serverUrl}/api/v1/namespaces/${prometheusPath}/proxy${cluster.getPrometheusApiPrefix()}/api/v1/query_range`
prometheusProvider = await cluster.contextHandler.getPrometheusProvider()
} catch {
this.respondJson(response, {})
@@ -111,7 +111,7 @@ export default {
updateValues: function(){
if (this.cluster.preferences.prometheus) {
const prom = this.cluster.preferences.prometheus;
this.prometheusPath = `${prom.namespace}/${prom.service}:${prom.port}`
this.prometheusPath = `${prom.namespace}/${prom.service}:${prom.port}${prom.prefix}`
} else {
this.prometheusPath = ""
}
@@ -122,11 +122,13 @@ export default {
}
},
parsePrometheusPath: function(path) {
let parsed = path.split(/\/|:/)
const parsed = path.split(/\/|:/, 3)
const apiPrefix = path.substring(parsed.join("/").length)
return {
namespace: parsed[0],
service: parsed[1],
port: parsed[2]
port: parsed[2],
prefix: apiPrefix
}
},
expandPath: function(value, event) {