Re: [PR] Mock `/api/v1/status/buildinfo` for PromQL API [skywalking]

2024-02-20 Thread via GitHub


wu-sheng merged PR #11901:
URL: https://github.com/apache/skywalking/pull/11901


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] Mock `/api/v1/status/buildinfo` for PromQL API [skywalking]

2024-02-20 Thread via GitHub


wu-sheng commented on code in PR #11901:
URL: https://github.com/apache/skywalking/pull/11901#discussion_r1495533200


##
oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLConfig.java:
##
@@ -31,4 +31,12 @@ public class PromQLConfig extends ModuleConfig {
 private int restMaxThreads = 200;
 private long restIdleTimeOut = 3;
 private int restAcceptQueueSize = 0;
+
+// SkyWalking supported basic metrics query API in Prometheus 2.45, and it 
is a LTS version, the API should stable, set as default.
+private String buildInfoVersion = "2.45.0";

Review Comment:
   ```suggestion
   private String buildInfoVersion = "2.45.0"; // Declare compatibility 
with 2.45 LTS version APIs.
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] Mock `/api/v1/status/buildinfo` for PromQL API [skywalking]

2024-02-20 Thread via GitHub


wu-sheng commented on code in PR #11901:
URL: https://github.com/apache/skywalking/pull/11901#discussion_r1495531905


##
oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLConfig.java:
##
@@ -31,4 +31,12 @@ public class PromQLConfig extends ModuleConfig {
 private int restMaxThreads = 200;
 private long restIdleTimeOut = 3;
 private int restAcceptQueueSize = 0;
+
+// SkyWalking supported basic metrics query API in Prometheus 2.45, and it 
is a LTS version, the API should stable, set as default.

Review Comment:
   ```suggestion
   // The following configs are used to build `/api/v1/status/buildinfo` 
API response.
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] Mock `/api/v1/status/buildinfo` for PromQL API [skywalking]

2024-02-20 Thread via GitHub


wu-sheng commented on code in PR #11901:
URL: https://github.com/apache/skywalking/pull/11901#discussion_r1495531006


##
oap-server/server-starter/src/main/resources/application.yml:
##
@@ -443,6 +443,13 @@ promql:
 restMaxThreads: ${SW_PROMQL_REST_MAX_THREADS:200}
 restIdleTimeOut: ${SW_PROMQL_REST_IDLE_TIMEOUT:3}
 restAcceptQueueSize: ${SW_PROMQL_REST_QUEUE_SIZE:0}
+# The below config is for the API buildInfo, set the value to mock the 
build info.

Review Comment:
   ```suggestion
   # The below configs are used to build `/api/v1/status/buildinfo` API 
response.
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



Re: [PR] Mock `/api/v1/status/buildinfo` for PromQL API [skywalking]

2024-02-20 Thread via GitHub


wu-sheng commented on code in PR #11901:
URL: https://github.com/apache/skywalking/pull/11901#discussion_r1495424254


##
oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/entity/BuildInfo.java:
##
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.skywalking.oap.query.promql.entity;
+
+import lombok.Data;
+
+/**
+ * Mock build info for PromQL API, sometimes the client(such as Grafana) use 
it to detect the version of the data-source server
+ * for different API support. SkyWalking supported basic metrics query API in 
Prometheus 2.45, and it is a LTS version, the API should stable.
+ */
+@Data
+public class BuildInfo {
+private String version = "2.45.0";
+private String revision = "";
+private String branch = "";
+private String buildUser = "";
+private String buildDate = "";
+private String goVersion = "";

Review Comment:
   Could we expose this to application.yml? Maybe next time, if some 
configurations are required, we could fix not through code changes?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org