From 6b78b77e7c83b487c3df2a26f94a96f6eb26d1eb Mon Sep 17 00:00:00 2001 From: msvinaykumar Date: Thu, 10 Oct 2024 10:46:45 +0530 Subject: [PATCH] changed Up metrics to look for just Success response Signed-off-by: msvinaykumar --- .../prometheus/PrometheusDataOperatorImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/autotune/common/datasource/prometheus/PrometheusDataOperatorImpl.java b/src/main/java/com/autotune/common/datasource/prometheus/PrometheusDataOperatorImpl.java index 418add724..b7f6b66b1 100644 --- a/src/main/java/com/autotune/common/datasource/prometheus/PrometheusDataOperatorImpl.java +++ b/src/main/java/com/autotune/common/datasource/prometheus/PrometheusDataOperatorImpl.java @@ -117,16 +117,11 @@ public Object getValueForQuery(DataSourceInfo dataSource, String query) { if (null == jsonObject) { return null; + } else { + return "1"; //if it returns HTTP STATUS_OK 200 } - JSONArray result = jsonObject.getJSONObject(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.DATA).getJSONArray(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.RESULT); - for (Object result_obj : result) { - JSONObject result_json = (JSONObject) result_obj; - if (result_json.has(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.VALUE) - && !result_json.getJSONArray(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.VALUE).isEmpty()) { - return result_json.getJSONArray(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.VALUE).getString(1); - } - } + } catch (JSONException e) { LOGGER.error(e.getMessage()); } catch (NullPointerException e) { @@ -159,6 +154,7 @@ public JSONObject getJsonObjectForQuery(DataSourceInfo dataSource, String query) JSONObject jsonObject = apiClient.fetchMetricsJson( KruizeConstants.HttpConstants.MethodType.GET, query); + /* TODO need to separate it out this logic form here if (!jsonObject.has(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.STATUS)) return null; if (!jsonObject.getString(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.STATUS).equalsIgnoreCase(KruizeConstants.DataSourceConstants.DataSourceQueryStatus.SUCCESS)) @@ -170,6 +166,8 @@ public JSONObject getJsonObjectForQuery(DataSourceInfo dataSource, String query) if (jsonObject.getJSONObject(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.DATA).getJSONArray(KruizeConstants.DataSourceConstants.DataSourceQueryJSONKeys.RESULT).isEmpty()) return null; + */ + return jsonObject; } catch (HttpHostConnectException e) {