Merge branch 'develop' into release/v0.43.x

ee/query-service/app/api/api.go

@@ -152,7 +152,6 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddlew
  router.HandleFunc("/api/v1/register", am.OpenAccess(ah.registerUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/login", am.OpenAccess(ah.loginUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(ah.searchTraces)).Methods(http.MethodGet)
- router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost)
 
  // PAT APIs
  router.HandleFunc("/api/v1/pats", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)

ee/query-service/app/server.go

@@ -329,7 +329,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e
  r.Use(loggingMiddleware)
 
  apiHandler.RegisterRoutes(r, am)
- apiHandler.RegisterMetricsRoutes(r, am)
  apiHandler.RegisterLogsRoutes(r, am)
  apiHandler.RegisterIntegrationRoutes(r, am)
  apiHandler.RegisterQueryRangeV3Routes(r, am)

frontend/package.json

@@ -44,6 +44,9 @@
  "@sentry/webpack-plugin": "2.16.0",
  "@signozhq/design-tokens": "0.0.8",
  "@uiw/react-md-editor": "3.23.5",
+ "@visx/group": "3.3.0",
+ "@visx/shape": "3.5.0",
+ "@visx/tooltip": "3.3.0",
  "@xstate/react": "^3.0.0",
  "ansi-to-html": "0.7.2",
  "antd": "5.11.0",

frontend/public/locales/en-GB/channels.json

@@ -15,6 +15,7 @@
  "button_test_channel": "Test",
  "button_return": "Back",
  "field_channel_name": "Name",
+ "field_send_resolved": "Send resolved alerts",
  "field_channel_type": "Type",
  "field_webhook_url": "Webhook URL",
  "field_slack_recipient": "Recipient",

frontend/public/locales/en/channels.json

@@ -15,6 +15,7 @@
  "button_test_channel": "Test",
  "button_return": "Back",
  "field_channel_name": "Name",
+ "field_send_resolved": "Send resolved alerts",
  "field_channel_type": "Type",
  "field_webhook_url": "Webhook URL",
  "field_slack_recipient": "Recipient",

frontend/src/api/channels/createEmail.ts

@@ -12,7 +12,7 @@ const create = async (
  name: props.name,
  email_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  to: props.to,
  html: props.html,
  headers: props.headers,

frontend/src/api/channels/createMsTeams.ts

@@ -12,7 +12,7 @@ const create = async (
  name: props.name,
  msteams_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  webhook_url: props.webhook_url,
  title: props.title,
  text: props.text,

frontend/src/api/channels/createPager.ts

@@ -12,7 +12,7 @@ const create = async (
  name: props.name,
  pagerduty_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  routing_key: props.routing_key,
  client: props.client,
  client_url: props.client_url,

frontend/src/api/channels/createSlack.ts

@@ -12,7 +12,7 @@ const create = async (
  name: props.name,
  slack_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  api_url: props.api_url,
  channel: props.channel,
  title: props.title,

frontend/src/api/channels/createWebhook.ts

@@ -30,7 +30,7 @@ const create = async (
  name: props.name,
  webhook_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  url: props.api_url,
  http_config: httpConfig,
  },

frontend/src/api/channels/editEmail.ts

@@ -12,7 +12,7 @@ const editEmail = async (
  name: props.name,
  email_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  to: props.to,
  html: props.html,
  headers: props.headers,

frontend/src/api/channels/editMsTeams.ts

@@ -12,7 +12,7 @@ const editMsTeams = async (
  name: props.name,
  msteams_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  webhook_url: props.webhook_url,
  title: props.title,
  text: props.text,

frontend/src/api/channels/editOpsgenie.ts

@@ -12,7 +12,7 @@ const editOpsgenie = async (
  name: props.name,
  opsgenie_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  api_key: props.api_key,
  description: props.description,
  priority: props.priority,

frontend/src/api/channels/editPager.ts

@@ -12,7 +12,7 @@ const editPager = async (
  name: props.name,
  pagerduty_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  routing_key: props.routing_key,
  client: props.client,
  client_url: props.client_url,

frontend/src/api/channels/editSlack.ts

@@ -12,7 +12,7 @@ const editSlack = async (
  name: props.name,
  slack_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  api_url: props.api_url,
  channel: props.channel,
  title: props.title,

frontend/src/api/channels/editWebhook.ts

@@ -29,7 +29,7 @@ const editWebhook = async (
  name: props.name,
  webhook_configs: [
  {
- send_resolved: true,
+ send_resolved: props.send_resolved,
  url: props.api_url,
  http_config: httpConfig,
  },

frontend/src/api/metrics/ApDex/getMetricMeta.ts

@@ -1,9 +1,11 @@
-import axios from 'api';
+import { ApiV4Instance } from 'api';
 import { AxiosResponse } from 'axios';
 import { MetricMetaProps } from 'types/api/metrics/getApDex';
 
 export const getMetricMeta = (
  metricName: string,
  servicename: string,
 ): Promise<AxiosResponse<MetricMetaProps>> =>
- axios.get(`/metric_meta?metricName=${metricName}&serviceName=${servicename}`);
+ ApiV4Instance.get(
+ `/metric/metric_metadata?metricName=${metricName}&serviceName=${servicename}`,
+ );