[FEATURE] add loki values, value names and logql variables

loki/package.json

@@ -74,6 +74,33 @@
           },
           "name": "LokiLogQuery"
         }
+      },
+      {
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Loki Label Values Variable"
+          },
+          "name": "LokiLabelValuesVariable"
+        }
+      },
+      {
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Loki Label Names Variable"
+          },
+          "name": "LokiLabelNamesVariable"
+        }
+      },
+      {
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Loki LogQL Variable"
+          },
+          "name": "LokiLogQLVariable"
+        }
       }
     ]
   }

loki/rsbuild.config.ts

@@ -25,6 +25,9 @@ export default createConfigForPlugin({
       './LokiDatasource': './src/datasources/loki-datasource',
       './LokiTimeSeriesQuery': './src/queries/loki-time-series-query',
       './LokiLogQuery': './src/queries/loki-log-query',
+      './LokiLabelValuesVariable': './src/variables/LokiLabelValuesVariable.tsx',
+      './LokiLabelNamesVariable': './src/variables/LokiLabelNamesVariable.tsx',
+      './LokiLogQLVariable': './src/variables/LokiLogQLVariable.tsx',
     },
     shared: {
       react: { requiredVersion: '18.2.0', singleton: true },

loki/schemas/variables/loki-label-names/loki-label-names.cue

@@ -0,0 +1,24 @@
+// Copyright The Perses 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.
+
+package model
+
+import (
+	ds "github.com/perses/plugins/loki/schemas/datasources:model"
+)
+
+kind: "LokiLabelNamesVariable"
+spec: close({
+	ds.#selector
+	matchers?: [...string]
+})

loki/schemas/variables/loki-label-names/tests/valid/loki-label-names.json

@@ -0,0 +1,8 @@
+{
+  "kind": "LokiLabelNamesVariable",
+  "spec": {
+    "matchers": [
+      "{job=\"myapp\"}"
+    ]
+  }
+}

loki/schemas/variables/loki-label-values/loki-label-values.cue

@@ -0,0 +1,26 @@
+// Copyright The Perses 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.
+
+package model
+
+import (
+	"strings"
+	ds "github.com/perses/plugins/loki/schemas/datasources:model"
+)
+
+kind: "LokiLabelValuesVariable"
+spec: close({
+	ds.#selector
+	labelName: strings.MinRunes(1)
+	matchers?: [...string]
+})

loki/schemas/variables/loki-label-values/tests/valid/loki-label-values.json

@@ -0,0 +1,9 @@
+{
+  "kind": "LokiLabelValuesVariable",
+  "spec": {
+    "labelName": "job",
+    "matchers": [
+      "{job=\"myapp\"}"
+    ]
+  }
+}

loki/schemas/variables/loki-logql/loki-logql.cue

@@ -0,0 +1,26 @@
+// Copyright The Perses 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.
+
+package model
+
+import (
+	"strings"
+	ds "github.com/perses/plugins/loki/schemas/datasources:model"
+)
+
+kind: "LokiLogQLVariable"
+spec: close({
+	ds.#selector
+	expr:      strings.MinRunes(1)
+	labelName: strings.MinRunes(1)
+})

loki/schemas/variables/loki-logql/tests/invalid/no-label.json

@@ -0,0 +1,7 @@
+{
+  "kind": "LokiLogQLVariable",
+  "spec": {
+    "expr": "count_over_time({job=\"myapp\"}[1h])",
+    "labelName": ""
+  }
+}

loki/schemas/variables/loki-logql/tests/valid/loki-logql.json

@@ -0,0 +1,7 @@
+{
+  "kind": "LokiLogQLVariable",
+  "spec": {
+    "expr": "count_over_time({job=\"myapp\"}[1h])",
+    "labelName": "job"
+  }
+}

loki/src/components/complete.ts

@@ -365,8 +365,8 @@ async function completeLabelName(completionCfg: CompletionConfig): Promise<Compl
   const end = completionCfg.timeRange?.end ? toUnixSeconds(new Date(completionCfg.timeRange.end).getTime()) : undefined;
 
   try {
-    const response = await completionCfg.client.labels(start, end);
-    if (response.status === 'success') {
+    const response = await completionCfg.client.labels({ start, end });
+    if (response.status === 'success' && response.data) {
       return response.data.map((label: string) => ({ label }));
     }
     return [];
@@ -387,8 +387,8 @@ async function completeLabelValue(completionCfg: CompletionConfig, label: string
   const end = completionCfg.timeRange?.end ? toUnixSeconds(new Date(completionCfg.timeRange.end).getTime()) : undefined;
 
   try {
-    const response = await completionCfg.client.labelValues(label, start, end);
-    if (response.status === 'success') {
+    const response = await completionCfg.client.labelValues({ labelName: label, start, end });
+    if (response.status === 'success' && response.data) {
       return response.data.map((value: string) => ({
         label: value ?? '',
         displayLabel: value ?? '(empty string)',

loki/src/datasources/loki-datasource/LokiDatasource.tsx

@@ -43,9 +43,8 @@ const createClient: DatasourcePlugin<LokiDatasourceSpec, LokiClient>['createClie
     },
     query: (params, headers) => query(params, { datasourceUrl, headers: headers ?? specHeaders }),
     queryRange: (params, headers) => queryRange(params, { datasourceUrl, headers: headers ?? specHeaders }),
-    labels: (start, end, headers) => labels(start, end, { datasourceUrl, headers: headers ?? specHeaders }),
-    labelValues: (label, start, end, headers) =>
-      labelValues(label, start, end, { datasourceUrl, headers: headers ?? specHeaders }),
+    labels: (params, headers) => labels(params, { datasourceUrl, headers: headers ?? specHeaders }),
+    labelValues: (params, headers) => labelValues(params, { datasourceUrl, headers: headers ?? specHeaders }),
     series: (match, start, end, headers) =>
       series(match, start, end, { datasourceUrl, headers: headers ?? specHeaders }),
     volume: (params, headers) => volume(params, { datasourceUrl, headers: headers ?? specHeaders }),

loki/src/index.ts

@@ -15,3 +15,4 @@ export { getPluginModule } from './getPluginModule';
 export * from './model';
 export * from './queries';
 export * from './datasources';
+export * from './variables';

loki/src/model/loki-client-types.ts

@@ -44,7 +44,7 @@ export interface LokiQueryResponse {
   };
 }
 
-export type LokiQueryRangeResponse = LokiQueryRangeMatrixResponse & LokiQueryRangeStreamsResponse;
+export type LokiQueryRangeResponse = LokiQueryRangeMatrixResponse | LokiQueryRangeStreamsResponse;
 
 export interface LokiQueryRangeMatrixResponse {
   status: 'success' | 'error';