Merge branch 'develop' into metrics-explorer-cursor

feat: metric explorer
Merge pull request #5704 from SigNoz/release/v0.52.x
2024-09-15 06:58:49 +05:30 · 2024-09-15 06:08:07 +05:30 · 2024-08-16 21:00:32 +05:30 · 2024-08-15 23:12:36 +05:30 · 2024-08-15 13:42:02 +05:30 · 2024-07-31 22:30:09 +05:30
13 changed files with 49 additions and 19 deletions
--- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -146,7 +146,7 @@ services:
        condition: on-failure

  query-service:
-    image: signoz/query-service:0.49.1
+    image: signoz/query-service:0.52.0
    command:
      [
        "-config=/root/config/prometheus.yml",
@@ -186,7 +186,7 @@ services:
    <<: *db-depend

  frontend:
-    image: signoz/frontend:0.48.0
+    image: signoz/frontend:0.52.0
    deploy:
      restart_policy:
        condition: on-failure
@@ -199,7 +199,7 @@ services:
      - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf

  otel-collector:
-    image: signoz/signoz-otel-collector:0.102.2
+    image: signoz/signoz-otel-collector:0.102.4
    command:
      [
        "--config=/etc/otel-collector-config.yaml",
@@ -238,7 +238,7 @@ services:
      - query-service

  otel-collector-migrator:
-      image: signoz/signoz-schema-migrator:0.102.2
+      image: signoz/signoz-schema-migrator:0.102.4
      deploy:
        restart_policy:
          condition: on-failure
--- a/deploy/docker/clickhouse-setup/docker-compose-core.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose-core.yaml
@@ -66,7 +66,7 @@ services:
      - --storage.path=/data

  otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.4}
    container_name: otel-migrator
    command:
      - "--dsn=tcp://clickhouse:9000"
@@ -81,7 +81,7 @@ services:
  # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
  otel-collector:
    container_name: signoz-otel-collector
-    image: signoz/signoz-otel-collector:0.102.2
+    image: signoz/signoz-otel-collector:0.102.4
    command:
      [
        "--config=/etc/otel-collector-config.yaml",
--- a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml
@@ -164,7 +164,7 @@ services:
  # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`

  query-service:
-    image: signoz/query-service:${DOCKER_TAG:-0.49.1}
+    image: signoz/query-service:${DOCKER_TAG:-0.52.0}
    container_name: signoz-query-service
    command:
      [
@@ -204,7 +204,7 @@ services:
    <<: *db-depend

  frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.49.1}
+    image: signoz/frontend:${DOCKER_TAG:-0.52.0}
    container_name: signoz-frontend
    restart: on-failure
    depends_on:
@@ -216,7 +216,7 @@ services:
      - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf

  otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.4}
    container_name: otel-migrator
    command:
      - "--dsn=tcp://clickhouse:9000"
@@ -230,7 +230,7 @@ services:


  otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.102.4}
    container_name: signoz-otel-collector
    command:
      [
--- a/deploy/docker/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -164,7 +164,7 @@ services:
  # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`

  query-service:
-    image: signoz/query-service:${DOCKER_TAG:-0.49.1}
+    image: signoz/query-service:${DOCKER_TAG:-0.52.0}
    container_name: signoz-query-service
    command:
      [
@@ -203,7 +203,7 @@ services:
    <<: *db-depend

  frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.49.1}
+    image: signoz/frontend:${DOCKER_TAG:-0.52.0}
    container_name: signoz-frontend
    restart: on-failure
    depends_on:
@@ -215,7 +215,7 @@ services:
      - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf

  otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.4}
    container_name: otel-migrator
    command:
      - "--dsn=tcp://clickhouse:9000"
@@ -229,7 +229,7 @@ services:


  otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.102.4}
    container_name: signoz-otel-collector
    command:
      [
--- a/frontend/src/AppRoutes/pageComponents.ts
+++ b/frontend/src/AppRoutes/pageComponents.ts
@@ -213,6 +213,10 @@ export const InstalledIntegrations = Loadable(
 		),
 );

+
+export const MetricsExplorer = Loadable(
+	() =>
+		import(/* webpackChunkName: "MetricsExplorer" */ 'pages/MetricsExplorer'),
 export const MessagingQueues = Loadable(
 	() =>
 		import(/* webpackChunkName: "MessagingQueues" */ 'pages/MessagingQueues'),
--- a/frontend/src/AppRoutes/routes.ts
+++ b/frontend/src/AppRoutes/routes.ts
@@ -25,6 +25,7 @@ import {
 	LogsExplorer,
 	LogsIndexToFields,
 	LogsSaveViews,
+	MetricsExplorer,
 	MessagingQueues,
 	MQDetailPage,
 	MySettings,
@@ -370,6 +371,13 @@ const routes: AppRoutes[] = [
 		key: 'INTEGRATIONS',
 	},
 	{
+		path: ROUTES.METRICS_EXPLORER,
+		exact: true,
+		component: MetricsExplorer,
+		isPrivate: true,
+		key: 'METRICS_EXPLORER',
+  },
+  {
 		path: ROUTES.MESSAGING_QUEUES,
 		exact: true,
 		component: MessagingQueues,
@@ -382,6 +390,7 @@ const routes: AppRoutes[] = [
 		component: MQDetailPage,
 		key: 'MESSAGING_QUEUES_DETAIL',
 		isPrivate: true,
+
 	},
 ];

--- a/frontend/src/constants/routes.ts
+++ b/frontend/src/constants/routes.ts
@@ -7,6 +7,7 @@ const ROUTES = {
 	TRACE: '/trace',
 	TRACE_DETAIL: '/trace/:id',
 	TRACES_EXPLORER: '/traces-explorer',
+	METRICS_EXPLORER: '/metrics-explorer',
 	GET_STARTED: '/get-started',
 	GET_STARTED_APPLICATION_MONITORING: '/get-started/application-monitoring',
 	GET_STARTED_LOGS_MANAGEMENT: '/get-started/logs-management',
--- a/frontend/src/container/SideNav/menuItems.tsx
+++ b/frontend/src/container/SideNav/menuItems.tsx
@@ -82,6 +82,11 @@ const menuItems: SidebarItem[] = [
 		label: 'Logs',
 		icon: <ScrollText size={16} />,
 	},
+	{
+		key: ROUTES.METRICS_EXPLORER,
+		label: 'Metrics Explorer',
+		icon: <LayoutGrid size={16} />,
+	},
 	{
 		key: ROUTES.ALL_DASHBOARD,
 		label: 'Dashboards',
--- a/frontend/src/pages/MetricsExplorer/index.tsx
+++ b/frontend/src/pages/MetricsExplorer/index.tsx
@@ -0,0 +1,10 @@
+function MetricsExplorer(): JSX.Element {
+	return (
+		<div>
+			<h1>Metrics Explorer</h1>
+			{/* Add your metrics explorer content here */}
+		</div>
+	);
+}
+
+export default MetricsExplorer;
--- a/frontend/src/utils/permission/index.ts
+++ b/frontend/src/utils/permission/index.ts
@@ -103,4 +103,5 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	SHORTCUTS: ['ADMIN', 'EDITOR', 'VIEWER'],
 	INTEGRATIONS: ['ADMIN', 'EDITOR', 'VIEWER'],
 	SERVICE_TOP_LEVEL_OPERATIONS: ['ADMIN', 'EDITOR', 'VIEWER'],
+	METRICS_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],
 };
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.23.2
 	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd
-	github.com/SigNoz/signoz-otel-collector v0.102.2
+	github.com/SigNoz/signoz-otel-collector v0.102.4
 	github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974
 	github.com/SigNoz/zap_otlp/zap_otlp_sync v0.0.0-20230822164844-1b861a431974
 	github.com/antonmedv/expr v1.15.3
--- a/go.sum
+++ b/go.sum
@@ -64,8 +64,8 @@ github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd h1:Bk43AsDYe0fhkb
 github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd/go.mod h1:nxRcH/OEdM8QxzH37xkGzomr1O0JpYBRS6pwjsWW6Pc=
 github.com/SigNoz/prometheus v1.11.1 h1:roM8ugYf4UxaeKKujEeBvoX7ybq3IrS+TB26KiRtIJg=
 github.com/SigNoz/prometheus v1.11.1/go.mod h1:uv4mQwZQtx7y4GQ6EdHOi8Wsk07uHNn2XHd1zM85m6I=
-github.com/SigNoz/signoz-otel-collector v0.102.2 h1:SmjsBZjMjTVVpuOlfJXlsDJQbdefQP/9Wz3CyzSuZuU=
-github.com/SigNoz/signoz-otel-collector v0.102.2/go.mod h1:ISAXYhZenojCWg6CdDJtPMpfS6Zwc08+uoxH25tc6Y0=
+github.com/SigNoz/signoz-otel-collector v0.102.4 h1:098regGkGcrv0eSGElD4uEyuChxLM9VUoeWMW6KrUTI=
+github.com/SigNoz/signoz-otel-collector v0.102.4/go.mod h1:3s9cSL8yexkBBMfK9mC3WWrAPm8oMtlZhvBxvt+Ziag=
 github.com/SigNoz/zap_otlp v0.1.0 h1:T7rRcFN87GavY8lDGZj0Z3Xv6OhJA6Pj3I9dNPmqvRc=
 github.com/SigNoz/zap_otlp v0.1.0/go.mod h1:lcHvbDbRgvDnPxo9lDlaL1JK2PyOyouP/C3ynnYIvyo=
 github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974 h1:PKVgdf83Yw+lZJbFtNGBgqXiXNf3+kOXW2qZ7Ms7OaY=
--- a/pkg/query-service/tests/test-deploy/docker-compose.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml
@@ -192,7 +192,7 @@ services:
    <<: *db-depend

  otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.102.4}
    container_name: otel-migrator
    command:
      - "--dsn=tcp://clickhouse:9000"
@@ -205,7 +205,7 @@ services:
      #   condition: service_healthy

  otel-collector:
-    image: signoz/signoz-otel-collector:0.102.2
+    image: signoz/signoz-otel-collector:0.102.4
    container_name: signoz-otel-collector
    command:
      [
Author	SHA1	Message	Date
Pranay Prateek	dd989df035	Merge branch 'develop' into metrics-explorer-cursor	2024-09-15 06:58:49 +05:30
Pranay Prateek	dfa2fa6957	feat: metric explorer	2024-09-15 06:08:07 +05:30
Prashant Shahi	5bcf7de440	Merge pull request #5704 from SigNoz/release/v0.52.x Release/v0.52.x	2024-08-16 21:00:32 +05:30
Prashant Shahi	703983a5f9	chore(signoz): 📌 pin versions: SigNoz 0.52.0, SigNoz OtelCollector 0.102.3 Signed-off-by: Prashant Shahi <prashant@signoz.io>	2024-08-15 23:12:36 +05:30
Prashant Shahi	766a2123c5	Merge branch 'main' into release/v0.52.x	2024-08-15 13:42:02 +05:30
Prashant Shahi	a476c68f7e	Merge pull request #5618 from SigNoz/release/v0.51.x Release/v0.51.x	2024-07-31 22:30:09 +05:30
Prashant Shahi	fc15aa6f1c	Merge branch 'develop' into release/v0.51.x	2024-07-31 21:29:07 +05:30
Prashant Shahi	4192fd573d	chore(signoz): 📌 pin versions: SigNoz 0.51.0, SigNoz OtelCollector 0.102.3 Signed-off-by: Prashant Shahi <prashant@signoz.io>	2024-07-31 20:29:09 +05:30
Prashant Shahi	ca13d80205	Merge branch 'main' into release/v0.51.x	2024-07-31 20:27:51 +05:30
Prashant Shahi	8d84ce8f06	Merge pull request #5509 from SigNoz/release/v0.50.x Release/v0.50.x	2024-07-17 20:16:19 +05:30
Prashant Shahi	09ea7b9eb5	chore(signoz): 📌 pin versions: SigNoz 0.50.0 Signed-off-by: Prashant Shahi <prashant@signoz.io>	2024-07-17 19:01:03 +05:30