refactor: updating store methods

Clarified CODEOWNERS comments and updated owner assignments.

.github/CODEOWNERS

@@ -1,8 +1,6 @@
 # CODEOWNERS info: https://help.github.com/en/articles/about-code-owners
 
-# Owners are automatically requested for review for PRs that changes code
-
-# that they own.
+# Owners are automatically requested for review for PRs that changes code that they own.
 
 /frontend/ @SigNoz/frontend-maintainers
 
@@ -11,8 +9,10 @@
 /frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json @makeavish
 /frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx @makeavish
 
-/deploy/ @SigNoz/devops
-.github @SigNoz/devops
+# CI
+/deploy/ @therealpandey
+.github @therealpandey
+go.mod @therealpandey
 
 # Scaffold Owners
 

.github/workflows/mergequeueci.yaml

@@ -0,0 +1,60 @@
+name: mergequeueci
+
+on:
+  pull_request:
+    types:
+      - dequeued
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == false
+    steps:
+      - name: alert
+        uses: slackapi/slack-github-action@v2.1.1
+        with:
+          webhook: ${{ secrets.SLACK_MERGE_QUEUE_WEBHOOK }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":x: PR removed from merge queue",
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": ":x: PR Removed from Merge Queue"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*<${{ github.event.pull_request.html_url }}|PR #${{ github.event.pull_request.number }}: ${{ github.event.pull_request.title }}>*"
+                  }
+                },
+                {
+                  "type": "divider"
+                },
+                {
+                  "type": "section",
+                  "fields": [
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Author*\n@${{ github.event.pull_request.user.login }}"
+                    }
+                  ]
+                }
+              ]
+            }
+      - name: comment
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: |
+          gh api repos/${{ github.repository }}/issues/$PR_NUMBER/comments \
+            -f body="> :x: **PR removed from merge queue**
+          >
+          > @$PR_AUTHOR your PR was removed from the merge queue. Fix the issue and re-queue when ready."

cmd/community/server.go

@@ -13,11 +13,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/gateway"
 	"github.com/SigNoz/signoz/pkg/gateway/noopgateway"
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/licensing/nooplicensing"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
@@ -91,9 +88,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(ps factory.ProviderSettings, q querier.Querier, a analytics.Analytics) querier.Handler {
 			return querier.NewHandler(ps, q, a)
 		},
-		func(_ sqlstore.SQLStore, _ licensing.Licensing, _ zeus.Zeus, _ gateway.Gateway, _ global.Config) cloudintegration.Module {
-			return implcloudintegration.NewModule()
-		},
 	)
 	if err != nil {
 		logger.ErrorContext(ctx, "failed to create signoz", "error", err)

cmd/enterprise/server.go

@@ -9,13 +9,12 @@ import (
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/oidccallbackauthn"
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/samlcallbackauthn"
 	"github.com/SigNoz/signoz/ee/authz/openfgaauthz"
+	eequerier "github.com/SigNoz/signoz/ee/querier"
 	"github.com/SigNoz/signoz/ee/authz/openfgaschema"
 	"github.com/SigNoz/signoz/ee/gateway/httpgateway"
 	enterpriselicensing "github.com/SigNoz/signoz/ee/licensing"
 	"github.com/SigNoz/signoz/ee/licensing/httplicensing"
-	"github.com/SigNoz/signoz/ee/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/ee/modules/dashboard/impldashboard"
-	eequerier "github.com/SigNoz/signoz/ee/querier"
 	enterpriseapp "github.com/SigNoz/signoz/ee/query-service/app"
 	"github.com/SigNoz/signoz/ee/sqlschema/postgressqlschema"
 	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
@@ -26,10 +25,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/authz"
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/gateway"
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/licensing"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	pkgimplcloudintegration "github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	pkgimpldashboard "github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
@@ -133,9 +129,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 			communityHandler := querier.NewHandler(ps, q, a)
 			return eequerier.NewHandler(ps, q, communityHandler)
 		},
-		func(store sqlstore.SQLStore, lic licensing.Licensing, z zeus.Zeus, gw gateway.Gateway, gc global.Config) cloudintegration.Module {
-			return implcloudintegration.NewModule(pkgimplcloudintegration.NewStore(store), store, lic, z, gw, gc)
-		},
 	)
 
 	if err != nil {

ee/modules/cloudintegration/implcloudintegration/aws.go

@@ -1,22 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type awsProvider struct{}
-
-func (p *awsProvider) CreateArtifact(
-	_ context.Context,
-	_ valuer.UUID,
-	_ *cloudintegrationtypes.ConnectionArtifactRequest,
-	_ cloudintegration.Credentials,
-	_ valuer.UUID,
-) (*cloudintegrationtypes.ConnectionArtifact, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}

ee/modules/cloudintegration/implcloudintegration/azure.go

@@ -1,23 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-// keeping this for example to show how more cloud providers will be added
-type azureProvider struct{}
-
-func (p *azureProvider) CreateArtifact(
-	_ context.Context,
-	_ valuer.UUID,
-	_ *cloudintegrationtypes.ConnectionArtifactRequest,
-	_ cloudintegration.Credentials,
-	_ valuer.UUID,
-) (*cloudintegrationtypes.ConnectionArtifact, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}

ee/modules/cloudintegration/implcloudintegration/module.go

@@ -1,267 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/gateway"
-	"github.com/SigNoz/signoz/pkg/global"
-	"github.com/SigNoz/signoz/pkg/licensing"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/modules/user/impluser"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/types/zeustypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/SigNoz/signoz/pkg/zeus"
-)
-
-type module struct {
-	store        cloudintegrationtypes.Store
-	userStore    types.UserStore
-	licensing    licensing.Licensing
-	zeus         zeus.Zeus
-	gateway      gateway.Gateway
-	globalConfig global.Config
-	providers    map[cloudintegrationtypes.CloudProviderType]cloudintegration.CloudProvider
-}
-
-func NewModule(
-	store cloudintegrationtypes.Store,
-	sqlStore sqlstore.SQLStore,
-	lic licensing.Licensing,
-	z zeus.Zeus,
-	gw gateway.Gateway,
-	gc global.Config,
-) cloudintegration.Module {
-	return &module{
-		store:        store,
-		userStore:    impluser.NewStore(sqlStore, factory.ProviderSettings{}),
-		licensing:    lic,
-		zeus:         z,
-		gateway:      gw,
-		globalConfig: gc,
-		providers:    map[cloudintegrationtypes.CloudProviderType]cloudintegration.CloudProvider{
-			cloudintegrationtypes.CloudProviderTypeAWS:   &awsProvider{},
-			cloudintegrationtypes.CloudProviderTypeAzure: &azureProvider{},
-		},
-	}
-}
-
-func (m *module) CreateConnectionArtifact(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType, request *cloudintegrationtypes.ConnectionArtifactRequest) (*cloudintegrationtypes.ConnectionArtifact, error) {
-	p, ok := m.providers[provider]
-	if !ok {
-		return nil, errors.NewInvalidInputf(cloudintegrationtypes.ErrCodeCloudProviderInvalidInput, "unsupported cloud provider: %s", provider.StringValue())
-	}
-
-	creds, err := m.resolveCredentials(ctx, orgID, provider)
-	if err != nil {
-		return nil, err
-	}
-
-	newAccountID := valuer.GenerateUUID()
-
-	artifact, err := p.CreateArtifact(ctx, orgID, request, creds, newAccountID)
-	if err != nil {
-		return nil, err
-	}
-
-	account := &cloudintegrationtypes.StorableCloudIntegration{
-		Identifiable: types.Identifiable{ID: newAccountID},
-		TimeAuditable: types.TimeAuditable{
-			CreatedAt: time.Now(),
-			UpdatedAt: time.Now(),
-		},
-		Provider: provider,
-		OrgID:    orgID,
-	}
-
-	if err := m.store.UpsertAccount(ctx, account); err != nil {
-		return nil, err
-	}
-
-	return artifact, nil
-}
-
-func (m *module) resolveCredentials(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType) (cloudintegration.Credentials, error) {
-	creds := cloudintegration.Credentials{}
-
-	pat, err := m.getOrCreateIntegrationPAT(ctx, orgID, provider)
-	if err != nil {
-		return creds, err
-	}
-	creds.SigNozAPIKey = pat
-
-	if m.licensing == nil {
-		return creds, nil
-	}
-
-	license, err := m.licensing.GetActive(ctx, orgID)
-	if err != nil {
-		return creds, err
-	}
-
-	if license == nil {
-		return creds, nil
-	}
-
-	respBytes, err := m.zeus.GetDeployment(ctx, license.Key)
-	if err != nil {
-		return creds, errors.NewInternalf(errors.CodeInternal, "couldn't query deployment info: %v", err)
-	}
-
-	deployment, err := zeustypes.NewGettableDeployment(respBytes)
-	if err != nil {
-		return creds, err
-	}
-	creds.SigNozAPIUrl = deployment.SignozAPIUrl
-
-	if m.globalConfig.IngestionURL != nil {
-		creds.IngestionUrl = m.globalConfig.IngestionURL.String()
-	}
-
-	if m.gateway != nil {
-		ingestionKeyName := fmt.Sprintf("%s-integration", provider.StringValue())
-		ingestionKey, err := m.getOrCreateIngestionKey(ctx, orgID, ingestionKeyName)
-		if err != nil {
-			return creds, err
-		}
-		creds.IngestionKey = ingestionKey
-	}
-
-	return creds, nil
-}
-
-func (m *module) getOrCreateIngestionKey(ctx context.Context, orgID valuer.UUID, keyName string) (string, error) {
-	result, err := m.gateway.SearchIngestionKeysByName(ctx, orgID, keyName, 1, 10)
-	if err != nil {
-		return "", errors.NewInternalf(errors.CodeInternal, "couldn't search ingestion keys: %v", err)
-	}
-
-	for _, k := range result.Keys {
-		if k.Name == keyName {
-			return k.Value, nil
-		}
-	}
-
-	created, err := m.gateway.CreateIngestionKey(ctx, orgID, keyName, []string{"integration"}, time.Time{})
-	if err != nil {
-		return "", errors.NewInternalf(errors.CodeInternal, "couldn't create ingestion key: %v", err)
-	}
-
-	return created.Value, nil
-}
-
-func (m *module) getOrCreateIntegrationPAT(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType) (string, error) {
-	integrationPATName := fmt.Sprintf("%s integration", provider.StringValue())
-
-	integrationUser, err := m.getOrCreateIntegrationUser(ctx, orgID, provider)
-	if err != nil {
-		return "", err
-	}
-
-	allPATs, err := m.userStore.ListAPIKeys(ctx, orgID)
-	if err != nil {
-		return "", errors.NewInternalf(errors.CodeInternal, "couldn't list PATs: %v", err)
-	}
-
-	for _, p := range allPATs {
-		if p.UserID == integrationUser.ID && p.Name == integrationPATName {
-			return p.Token, nil
-		}
-	}
-
-	newPAT, err := types.NewStorableAPIKey(
-		integrationPATName,
-		integrationUser.ID,
-		types.RoleViewer,
-		0,
-	)
-	if err != nil {
-		return "", errors.NewInternalf(errors.CodeInternal, "couldn't create cloud integration PAT: %v", err)
-	}
-
-	if err := m.userStore.CreateAPIKey(ctx, newPAT); err != nil {
-		return "", errors.NewInternalf(errors.CodeInternal, "couldn't persist cloud integration PAT: %v", err)
-	}
-
-	return newPAT.Token, nil
-}
-
-func (m *module) getOrCreateIntegrationUser(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType) (*types.User, error) {
-	cloudIntegrationUserName := fmt.Sprintf("%s-integration", provider.StringValue())
-	email := valuer.MustNewEmail(fmt.Sprintf("%s@signoz.io", cloudIntegrationUserName))
-
-	existingUsers, err := m.userStore.GetUsersByEmailAndOrgID(ctx, email, orgID)
-	if err != nil {
-		return nil, errors.NewInternalf(errors.CodeInternal, "couldn't look up integration user: %v", err)
-	}
-
-	for _, u := range existingUsers {
-		if u.Status != types.UserStatusDeleted {
-			return u, nil
-		}
-	}
-
-	cloudIntegrationUser, err := types.NewUser(cloudIntegrationUserName, email, types.RoleViewer, orgID, types.UserStatusActive)
-	if err != nil {
-		return nil, errors.NewInternalf(errors.CodeInternal, "couldn't construct integration user: %v", err)
-	}
-
-	password := types.MustGenerateFactorPassword(cloudIntegrationUser.ID.StringValue())
-
-	if err := m.userStore.CreateUser(ctx, cloudIntegrationUser); err != nil {
-		return nil, errors.NewInternalf(errors.CodeInternal, "couldn't create integration user: %v", err)
-	}
-
-	if err := m.userStore.CreatePassword(ctx, password); err != nil {
-		return nil, errors.NewInternalf(errors.CodeInternal, "couldn't create integration user password: %v", err)
-	}
-
-	return cloudIntegrationUser, nil
-}
-
-func (m *module) GetAccountStatus(_ context.Context, _, _ valuer.UUID) (*cloudintegrationtypes.AccountStatus, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) ListConnectedAccounts(_ context.Context, _ valuer.UUID) (*cloudintegrationtypes.ConnectedAccounts, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) DisconnectAccount(_ context.Context, _, _ valuer.UUID) error {
-	return errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) UpdateAccountConfig(_ context.Context, _, _ valuer.UUID, _ *cloudintegrationtypes.UpdateAccountConfigRequest) (*cloudintegrationtypes.Account, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) ListServicesSummary(_ context.Context, _ valuer.UUID, _ *valuer.UUID) (*cloudintegrationtypes.ServicesSummary, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) GetService(_ context.Context, _ valuer.UUID, _ string, _ *valuer.UUID) (*cloudintegrationtypes.Service, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) UpdateServiceConfig(_ context.Context, _ string, _ valuer.UUID, _ *cloudintegrationtypes.UpdateServiceConfigRequest) (*cloudintegrationtypes.ServiceSummary, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) AgentCheckIn(_ context.Context, _ valuer.UUID, _ *cloudintegrationtypes.AgentCheckInRequest) (cloudintegrationtypes.AgentCheckInResponse, error) {
-	return cloudintegrationtypes.AgentCheckInResponse{}, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) GetDashboardByID(_ context.Context, _ string, _ valuer.UUID) (*dashboardtypes.Dashboard, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}
-
-func (m *module) GetAllDashboards(_ context.Context, _ valuer.UUID) ([]*dashboardtypes.Dashboard, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "not implemented")
-}

frontend/src/constants/queryBuilder.ts

@@ -1,5 +1,6 @@
 // ** Helpers
 import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
+import { defaultTraceSelectedColumns } from 'container/OptionsMenu/constants';
 import { createIdFromObjectFields } from 'lib/createIdFromObjectFields';
 import { createNewBuilderItemName } from 'lib/newQueryBuilder/createNewBuilderItemName';
 import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';
@@ -548,3 +549,49 @@ export const DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY: Record<
 	[DataTypes.ArrayBool]: 'boolAttributeValues',
 	[DataTypes.EMPTY]: 'stringAttributeValues',
 };
+
+export const listViewInitialLogQuery: Query = {
+	...initialQueriesMap.logs,
+	builder: {
+		...initialQueriesMap.logs.builder,
+		queryData: [
+			{
+				...initialQueriesMap.logs.builder.queryData[0],
+				aggregateOperator: LogsAggregatorOperator.NOOP,
+				orderBy: [{ columnName: 'timestamp', order: 'desc' }],
+				offset: 0,
+				pageSize: 100,
+			},
+		],
+	},
+};
+
+export const PANEL_TYPES_INITIAL_QUERY: Record<PANEL_TYPES, Query> = {
+	[PANEL_TYPES.TIME_SERIES]: initialQueriesMap.metrics,
+	[PANEL_TYPES.VALUE]: initialQueriesMap.metrics,
+	[PANEL_TYPES.TABLE]: initialQueriesMap.metrics,
+	[PANEL_TYPES.LIST]: listViewInitialLogQuery,
+	[PANEL_TYPES.TRACE]: initialQueriesMap.traces,
+	[PANEL_TYPES.BAR]: initialQueriesMap.metrics,
+	[PANEL_TYPES.PIE]: initialQueriesMap.metrics,
+	[PANEL_TYPES.HISTOGRAM]: initialQueriesMap.metrics,
+	[PANEL_TYPES.EMPTY_WIDGET]: initialQueriesMap.metrics,
+};
+
+export const listViewInitialTraceQuery: Query = {
+	// it should be the above commented query
+	...initialQueriesMap.traces,
+	builder: {
+		...initialQueriesMap.traces.builder,
+		queryData: [
+			{
+				...initialQueriesMap.traces.builder.queryData[0],
+				aggregateOperator: LogsAggregatorOperator.NOOP,
+				orderBy: [{ columnName: 'timestamp', order: 'desc' }],
+				offset: 0,
+				pageSize: 10,
+				selectColumns: defaultTraceSelectedColumns,
+			},
+		],
+	},
+};

frontend/src/container/DashboardContainer/ComponentsSlider/constants.ts

@@ -1,50 +0,0 @@
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import { defaultTraceSelectedColumns } from 'container/OptionsMenu/constants';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { LogsAggregatorOperator } from 'types/common/queryBuilder';
-
-export const PANEL_TYPES_INITIAL_QUERY = {
-	[PANEL_TYPES.TIME_SERIES]: initialQueriesMap.metrics,
-	[PANEL_TYPES.VALUE]: initialQueriesMap.metrics,
-	[PANEL_TYPES.TABLE]: initialQueriesMap.metrics,
-	[PANEL_TYPES.LIST]: initialQueriesMap.logs,
-	[PANEL_TYPES.TRACE]: initialQueriesMap.traces,
-	[PANEL_TYPES.BAR]: initialQueriesMap.metrics,
-	[PANEL_TYPES.PIE]: initialQueriesMap.metrics,
-	[PANEL_TYPES.HISTOGRAM]: initialQueriesMap.metrics,
-	[PANEL_TYPES.EMPTY_WIDGET]: initialQueriesMap.metrics,
-};
-
-export const listViewInitialLogQuery: Query = {
-	...initialQueriesMap.logs,
-	builder: {
-		...initialQueriesMap.logs.builder,
-		queryData: [
-			{
-				...initialQueriesMap.logs.builder.queryData[0],
-				aggregateOperator: LogsAggregatorOperator.NOOP,
-				orderBy: [{ columnName: 'timestamp', order: 'desc' }],
-				offset: 0,
-				pageSize: 100,
-			},
-		],
-	},
-};
-
-export const listViewInitialTraceQuery: Query = {
-	// it should be the above commented query
-	...initialQueriesMap.traces,
-	builder: {
-		...initialQueriesMap.traces.builder,
-		queryData: [
-			{
-				...initialQueriesMap.traces.builder.queryData[0],
-				aggregateOperator: LogsAggregatorOperator.NOOP,
-				orderBy: [{ columnName: 'timestamp', order: 'desc' }],
-				offset: 0,
-				pageSize: 10,
-				selectColumns: defaultTraceSelectedColumns,
-			},
-		],
-	},
-};

frontend/src/container/DashboardContainer/ComponentsSlider/index.tsx

@@ -1,94 +0,0 @@
-import { Card, Modal } from 'antd';
-import logEvent from 'api/common/logEvent';
-import { QueryParams } from 'constants/query';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import createQueryParams from 'lib/createQueryParams';
-import history from 'lib/history';
-import { useDashboard } from 'providers/Dashboard/Dashboard';
-import { LogsAggregatorOperator } from 'types/common/queryBuilder';
-import { v4 as uuid } from 'uuid';
-
-import { PANEL_TYPES_INITIAL_QUERY } from './constants';
-import menuItems from './menuItems';
-import { Text } from './styles';
-
-import './ComponentSlider.styles.scss';
-
-function DashboardGraphSlider(): JSX.Element {
-	const { handleToggleDashboardSlider, isDashboardSliderOpen } = useDashboard();
-
-	const onClickHandler = (name: PANEL_TYPES) => (): void => {
-		const id = uuid();
-		handleToggleDashboardSlider(false);
-		logEvent('Dashboard Detail: New panel type selected', {
-			// dashboardId: '',
-			// dashboardName: '',
-			// numberOfPanels: 0, // todo - at this point we don't know these attributes
-			panelType: name,
-			widgetId: id,
-		});
-		const queryParamsLog = {
-			graphType: name,
-			widgetId: id,
-			[QueryParams.compositeQuery]: JSON.stringify({
-				...PANEL_TYPES_INITIAL_QUERY[name],
-				builder: {
-					...PANEL_TYPES_INITIAL_QUERY[name].builder,
-					queryData: [
-						{
-							...PANEL_TYPES_INITIAL_QUERY[name].builder.queryData[0],
-							aggregateOperator: LogsAggregatorOperator.NOOP,
-							orderBy: [{ columnName: 'timestamp', order: 'desc' }],
-							offset: 0,
-							pageSize: 100,
-						},
-					],
-				},
-			}),
-		};
-
-		const queryParams = {
-			graphType: name,
-			widgetId: id,
-			[QueryParams.compositeQuery]: JSON.stringify(
-				PANEL_TYPES_INITIAL_QUERY[name],
-			),
-		};
-		if (name === PANEL_TYPES.LIST) {
-			history.push(
-				`${history.location.pathname}/new?${createQueryParams(queryParamsLog)}`,
-			);
-		} else {
-			history.push(
-				`${history.location.pathname}/new?${createQueryParams(queryParams)}`,
-			);
-		}
-	};
-
-	const handleCardClick = (panelType: PANEL_TYPES): void => {
-		onClickHandler(panelType)();
-	};
-
-	return (
-		<Modal
-			open={isDashboardSliderOpen}
-			onCancel={(): void => {
-				handleToggleDashboardSlider(false);
-			}}
-			rootClassName="graph-selection"
-			footer={null}
-			title="New Panel"
-		>
-			<div className="panel-selection">
-				{menuItems.map(({ name, icon, display }) => (
-					<Card onClick={(): void => handleCardClick(name)} id={name} key={name}>
-						{icon}
-						<Text>{display}</Text>
-					</Card>
-				))}
-			</div>
-		</Modal>
-	);
-}
-
-export default DashboardGraphSlider;

frontend/src/container/DashboardContainer/ComponentsSlider/styles.ts

@@ -1,41 +0,0 @@
-import { Card as CardComponent, Typography } from 'antd';
-import styled from 'styled-components';
-
-export const Container = styled.div`
-	display: flex;
-	justify-content: right;
-	gap: 8px;
-	margin-bottom: 12px;
-`;
-
-export const Card = styled(CardComponent)`
-	min-height: 80px;
-	min-width: 120px;
-	overflow-y: auto;
-	cursor: pointer;
-	transition: transform 0.2s;
-
-	.ant-card-body {
-		padding: 12px;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: center;
-
-		.ant-typography {
-			font-size: 12px;
-			font-weight: 600;
-		}
-	}
-
-	&:hover {
-		transform: scale(1.05);
-		border: 1px solid var(--bg-robin-400);
-	}
-`;
-
-export const Text = styled(Typography)`
-	text-align: center;
-	margin-top: 1rem;
-`;

frontend/src/container/DashboardContainer/DashboardDescription/__tests__/DashboardDescription.test.tsx

@@ -182,9 +182,7 @@ describe('Dashboard landing page actions header tests', () => {
 		(useLocation as jest.Mock).mockReturnValue(mockLocation);
 
 		const mockContextValue: IDashboardContext = {
-			isDashboardSliderOpen: false,
 			isDashboardLocked: false,
-			handleToggleDashboardSlider: jest.fn(),
 			handleDashboardLockToggle: jest.fn(),
 			dashboardResponse: {} as IDashboardContext['dashboardResponse'],
 			selectedDashboard: (getDashboardById.data as unknown) as Dashboard,

frontend/src/container/DashboardContainer/DashboardDescription/index.tsx

@@ -40,6 +40,7 @@ import {
 } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
+import { usePanelTypeSelectionModalStore } from 'providers/Dashboard/helpers/panelTypeSelectionModalHelper';
 import { sortLayout } from 'providers/Dashboard/util';
 import { DashboardData } from 'types/api/dashboard/getAll';
 import { Props } from 'types/api/dashboard/update';
@@ -48,10 +49,10 @@ import { ComponentTypes } from 'utils/permission';
 import { v4 as uuid } from 'uuid';
 
 import DashboardHeader from '../components/DashboardHeader/DashboardHeader';
-import DashboardGraphSlider from '../ComponentsSlider';
 import DashboardSettings from '../DashboardSettings';
 import { Base64Icons } from '../DashboardSettings/General/utils';
 import DashboardVariableSelection from '../DashboardVariablesSelection';
+import PanelTypeSelectionModal from '../PanelTypeSelectionModal';
 import SettingsDrawer from './SettingsDrawer';
 import { VariablesSettingsTab } from './types';
 import {
@@ -69,6 +70,9 @@ interface DashboardDescriptionProps {
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 	const { handle } = props;
+	const setIsPanelTypeSelectionModalOpen = usePanelTypeSelectionModalStore(
+		(s) => s.setIsPanelTypeSelectionModalOpen,
+	);
 	const {
 		selectedDashboard,
 		panelMap,
@@ -77,7 +81,6 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 		setLayouts,
 		isDashboardLocked,
 		setSelectedDashboard,
-		handleToggleDashboardSlider,
 		handleDashboardLockToggle,
 	} = useDashboard();
 
@@ -145,14 +148,14 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 	const [addPanelPermission] = useComponentPermission(permissions, userRole);
 
 	const onEmptyWidgetHandler = useCallback(() => {
-		handleToggleDashboardSlider(true);
+		setIsPanelTypeSelectionModalOpen(true);
 		logEvent('Dashboard Detail: Add new panel clicked', {
 			dashboardId: selectedDashboard?.id,
 			dashboardName: selectedDashboard?.data.title,
 			numberOfPanels: selectedDashboard?.data.widgets?.length,
 		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [handleToggleDashboardSlider]);
+	}, [setIsPanelTypeSelectionModalOpen]);
 
 	const handleLockDashboardToggle = (): void => {
 		setIsDashbordSettingsOpen(false);
@@ -521,7 +524,7 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 					<DashboardVariableSelection />
 				</section>
 			)}
-			<DashboardGraphSlider />
+			<PanelTypeSelectionModal />
 
 			<Modal
 				open={isRenameDashboardOpen}

frontend/src/container/DashboardContainer/PanelTypeSelectionModal/PanelTypeSelectionModal.styles.scss

@@ -1,4 +1,4 @@
-.graph-selection {
+.panel-type-selection-modal {
 	.ant-modal-content {
 		width: 515px;
 		max-height: 646px;
@@ -76,6 +76,11 @@
 						content: none;
 					}
 				}
+
+				.panel-type-text {
+					text-align: center;
+					margin-top: 1rem;
+				}
 			}
 		}
 
@@ -114,7 +119,7 @@
 }
 
 .lightMode {
-	.graph-selection {
+	.panel-type-selection-modal {
 		.ant-modal-content {
 			border: 1px solid var(--bg-vanilla-300);
 			background: var(--bg-vanilla-100);

frontend/src/container/DashboardContainer/PanelTypeSelectionModal/index.tsx

@@ -0,0 +1,68 @@
+import { memo } from 'react';
+import { Card, Modal, Typography } from 'antd';
+import logEvent from 'api/common/logEvent';
+import { QueryParams } from 'constants/query';
+import { PANEL_TYPES, PANEL_TYPES_INITIAL_QUERY } from 'constants/queryBuilder';
+import createQueryParams from 'lib/createQueryParams';
+import history from 'lib/history';
+import { usePanelTypeSelectionModalStore } from 'providers/Dashboard/helpers/panelTypeSelectionModalHelper';
+import { v4 as uuid } from 'uuid';
+
+import { PanelTypesWithData } from './menuItems';
+
+import './PanelTypeSelectionModal.styles.scss';
+
+function PanelTypeSelectionModal(): JSX.Element {
+	const {
+		isPanelTypeSelectionModalOpen,
+		setIsPanelTypeSelectionModalOpen,
+	} = usePanelTypeSelectionModalStore();
+
+	const onClickHandler = (name: PANEL_TYPES) => (): void => {
+		const id = uuid();
+		setIsPanelTypeSelectionModalOpen(false);
+		logEvent('Dashboard Detail: New panel type selected', {
+			panelType: name,
+			widgetId: id,
+		});
+
+		const queryParams = {
+			graphType: name,
+			widgetId: id,
+			[QueryParams.compositeQuery]: JSON.stringify(
+				PANEL_TYPES_INITIAL_QUERY[name],
+			),
+		};
+
+		history.push(
+			`${history.location.pathname}/new?${createQueryParams(queryParams)}`,
+		);
+	};
+
+	const handleCardClick = (panelType: PANEL_TYPES): void => {
+		onClickHandler(panelType)();
+	};
+
+	return (
+		<Modal
+			open={isPanelTypeSelectionModalOpen}
+			onCancel={(): void => {
+				setIsPanelTypeSelectionModalOpen(false);
+			}}
+			rootClassName="panel-type-selection-modal"
+			footer={null}
+			title="New Panel"
+		>
+			<div className="panel-selection">
+				{PanelTypesWithData.map(({ name, icon, display }) => (
+					<Card onClick={(): void => handleCardClick(name)} id={name} key={name}>
+						{icon}
+						<Typography className="panel-type-text">{display}</Typography>
+					</Card>
+				))}
+			</div>
+		</Modal>
+	);
+}
+
+export default memo(PanelTypeSelectionModal);

frontend/src/container/DashboardContainer/PanelTypeSelectionModal/menuItems.tsx

@@ -9,7 +9,7 @@ import {
 	Table,
 } from 'lucide-react';
 
-const Items: ItemsProps[] = [
+export const PanelTypesWithData: ItemsProps[] = [
 	{
 		name: PANEL_TYPES.TIME_SERIES,
 		icon: <LineChart size={16} color={Color.BG_ROBIN_400} />,
@@ -52,5 +52,3 @@ export interface ItemsProps {
 	icon: JSX.Element;
 	display: string;
 }
-
-export default Items;

frontend/src/container/GridCardLayout/DashboardEmptyState/DashboardEmptyState.tsx

@@ -9,17 +9,18 @@ import DashboardSettings from 'container/DashboardContainer/DashboardSettings';
 import useComponentPermission from 'hooks/useComponentPermission';
 import { useAppContext } from 'providers/App/App';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
+import { usePanelTypeSelectionModalStore } from 'providers/Dashboard/helpers/panelTypeSelectionModalHelper';
 import { ROLES, USER_ROLES } from 'types/roles';
 import { ComponentTypes } from 'utils/permission';
 
 import './DashboardEmptyState.styles.scss';
 
 export default function DashboardEmptyState(): JSX.Element {
-	const {
-		selectedDashboard,
-		isDashboardLocked,
-		handleToggleDashboardSlider,
-	} = useDashboard();
+	const setIsPanelTypeSelectionModalOpen = usePanelTypeSelectionModalStore(
+		(s) => s.setIsPanelTypeSelectionModalOpen,
+	);
+
+	const { selectedDashboard, isDashboardLocked } = useDashboard();
 
 	const variablesSettingsTabHandle = useRef<VariablesSettingsTab>(null);
 	const [isSettingsDrawerOpen, setIsSettingsDrawerOpen] = useState<boolean>(
@@ -41,14 +42,14 @@ export default function DashboardEmptyState(): JSX.Element {
 	const [addPanelPermission] = useComponentPermission(permissions, userRole);
 
 	const onEmptyWidgetHandler = useCallback(() => {
-		handleToggleDashboardSlider(true);
+		setIsPanelTypeSelectionModalOpen(true);
 		logEvent('Dashboard Detail: Add new panel clicked', {
 			dashboardId: selectedDashboard?.id,
 			dashboardName: selectedDashboard?.data.title,
 			numberOfPanels: selectedDashboard?.data.widgets?.length,
 		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [handleToggleDashboardSlider]);
+	}, [setIsPanelTypeSelectionModalOpen]);
 
 	const onConfigureClick = useCallback((): void => {
 		setIsSettingsDrawerOpen(true);

frontend/src/container/GridCardLayout/GridCard/FullView/PanelTypeSelector.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { Select, Typography } from 'antd';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import GraphTypes from 'container/DashboardContainer/ComponentsSlider/menuItems';
+import { PanelTypesWithData } from 'container/DashboardContainer/PanelTypeSelectionModal/menuItems';
 import { handleQueryChange } from 'container/NewWidget/utils';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
@@ -59,7 +59,7 @@ function PanelTypeSelector({
 				data-testid="panel-change-select"
 				disabled={disabled}
 			>
-				{GraphTypes.map((item) => (
+				{PanelTypesWithData.map((item) => (
 					<Option key={item.name} value={item.name}>
 						<div className="view-panel-select-option">
 							<div className="icon">{item.icon}</div>

frontend/src/container/GridCardLayout/WidgetRow.tsx

@@ -5,6 +5,7 @@ import useComponentPermission from 'hooks/useComponentPermission';
 import { EllipsisIcon, PenLine, Plus, X } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
+import { usePanelTypeSelectionModalStore } from 'providers/Dashboard/helpers/panelTypeSelectionModalHelper';
 import { setSelectedRowWidgetId } from 'providers/Dashboard/helpers/selectedRowWidgetIdHelper';
 import { ROLES, USER_ROLES } from 'types/roles';
 import { ComponentTypes } from 'utils/permission';
@@ -34,11 +35,11 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 	} = props;
 	const [isRowSettingsOpen, setIsRowSettingsOpen] = useState<boolean>(false);
 
-	const {
-		handleToggleDashboardSlider,
-		selectedDashboard,
-		isDashboardLocked,
-	} = useDashboard();
+	const setIsPanelTypeSelectionModalOpen = usePanelTypeSelectionModalStore(
+		(s) => s.setIsPanelTypeSelectionModalOpen,
+	);
+
+	const { selectedDashboard, isDashboardLocked } = useDashboard();
 
 	const permissions: ComponentTypes[] = ['add_panel'];
 	const { user } = useAppContext();
@@ -87,7 +88,7 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 								}
 
 								setSelectedRowWidgetId(selectedDashboard.id, id);
-								handleToggleDashboardSlider(true);
+								setIsPanelTypeSelectionModalOpen(true);
 							}}
 						>
 							New Panel

frontend/src/container/Home/Home.tsx

@@ -15,6 +15,7 @@ import ROUTES from 'constants/routes';
 import { getMetricsListQuery } from 'container/MetricsExplorer/Summary/utils';
 import { useGetMetricsList } from 'hooks/metricsExplorer/useGetMetricsList';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
+import { useIsDarkMode } from 'hooks/useDarkMode';
 import history from 'lib/history';
 import cloneDeep from 'lodash-es/cloneDeep';
 import { AnimatePresence } from 'motion/react';
@@ -43,6 +44,7 @@ const homeInterval = 30 * 60 * 1000;
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export default function Home(): JSX.Element {
 	const { user } = useAppContext();
+	const isDarkMode = useIsDarkMode();
 
 	const [startTime, setStartTime] = useState<number | null>(null);
 	const [endTime, setEndTime] = useState<number | null>(null);
@@ -680,7 +682,11 @@ export default function Home(): JSX.Element {
 
 												<div className="checklist-img-container">
 													<img
-														src="/Images/allInOne.svg"
+														src={
+															isDarkMode
+																? '/Images/allInOne.svg'
+																: '/Images/allInOneLightMode.svg'
+														}
 														alt="checklist-img"
 														className="checklist-img"
 													/>

frontend/src/container/NewWidget/RightContainer/index.tsx

@@ -20,9 +20,10 @@ import {
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
 import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES, PanelDisplay } from 'constants/queryBuilder';
-import GraphTypes, {
+import {
 	ItemsProps,
-} from 'container/DashboardContainer/ComponentsSlider/menuItems';
+	PanelTypesWithData,
+} from 'container/DashboardContainer/PanelTypeSelectionModal/menuItems';
 import { useDashboardVariables } from 'hooks/dashboard/useDashboardVariables';
 import useCreateAlerts from 'hooks/queryBuilder/useCreateAlerts';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -150,7 +151,7 @@ function RightContainer({
 	);
 
 	const selectedGraphType =
-		GraphTypes.find((e) => e.name === selectedGraph)?.display || '';
+		PanelTypesWithData.find((e) => e.name === selectedGraph)?.display || '';
 
 	const onCreateAlertsHandler = useCreateAlerts(selectedWidget, 'panelView');
 
@@ -176,7 +177,7 @@ function RightContainer({
 
 	const { currentQuery } = useQueryBuilder();
 
-	const [graphTypes, setGraphTypes] = useState<ItemsProps[]>(GraphTypes);
+	const [graphTypes, setGraphTypes] = useState<ItemsProps[]>(PanelTypesWithData);
 
 	const dashboardVariableOptions = useMemo<VariableOption[]>(() => {
 		return Object.entries(dashboardVariables).map(([, value]) => ({
@@ -272,7 +273,7 @@ function RightContainer({
 				prev.filter((graph) => graph.name !== PANEL_TYPES.LIST),
 			);
 		} else {
-			setGraphTypes(GraphTypes);
+			setGraphTypes(PanelTypesWithData);
 		}
 	}, [currentQuery]);
 

frontend/src/container/NewWidget/utils.ts

@@ -11,11 +11,8 @@ import { getYAxisCategories } from 'components/YAxisUnitSelector/utils';
 import {
 	initialQueryBuilderFormValuesMap,
 	PANEL_TYPES,
-} from 'constants/queryBuilder';
-import {
-	listViewInitialLogQuery,
 	PANEL_TYPES_INITIAL_QUERY,
-} from 'container/DashboardContainer/ComponentsSlider/constants';
+} from 'constants/queryBuilder';
 import {
 	defaultLogsSelectedColumns,
 	defaultTraceSelectedColumns,
@@ -549,10 +546,7 @@ export const getDefaultWidgetData = (
 	nullZeroValues: '',
 	opacity: '',
 	panelTypes: name,
-	query:
-		name === PANEL_TYPES.LIST
-			? listViewInitialLogQuery
-			: PANEL_TYPES_INITIAL_QUERY[name],
+	query: PANEL_TYPES_INITIAL_QUERY[name],
 	timePreferance: 'GLOBAL_TIME',
 	softMax: null,
 	softMin: null,

frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts

@@ -12,6 +12,8 @@ import {
 	ATTRIBUTE_TYPES,
 	initialAutocompleteData,
 	initialQueryBuilderFormValuesMap,
+	listViewInitialLogQuery,
+	listViewInitialTraceQuery,
 	mapOfFormulaToFilters,
 	mapOfQueryFilters,
 	PANEL_TYPES,
@@ -23,10 +25,6 @@ import {
 	metricsUnknownSpaceAggregateOperatorOptions,
 	metricsUnknownTimeAggregateOperatorOptions,
 } from 'constants/queryBuilderOperators';
-import {
-	listViewInitialLogQuery,
-	listViewInitialTraceQuery,
-} from 'container/DashboardContainer/ComponentsSlider/constants';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { getMetricsOperatorsByAttributeType } from 'lib/newQueryBuilder/getMetricsOperatorsByAttributeType';
 import { getOperatorsBySourceAndPanelType } from 'lib/newQueryBuilder/getOperatorsBySourceAndPanelType';

frontend/src/providers/Dashboard/Dashboard.tsx

@@ -53,9 +53,7 @@ import { IDashboardContext, WidgetColumnWidths } from './types';
 import { sortLayout } from './util';
 
 export const DashboardContext = createContext<IDashboardContext>({
-	isDashboardSliderOpen: false,
 	isDashboardLocked: false,
-	handleToggleDashboardSlider: () => {},
 	handleDashboardLockToggle: () => {},
 	dashboardResponse: {} as UseQueryResult<
 		SuccessResponseV2<Dashboard>,
@@ -82,8 +80,6 @@ export function DashboardProvider({
 	children,
 	dashboardId,
 }: PropsWithChildren<{ dashboardId: string }>): JSX.Element {
-	const [isDashboardSliderOpen, setIsDashboardSlider] = useState<boolean>(false);
-
 	const [isDashboardLocked, setIsDashboardLocked] = useState<boolean>(false);
 
 	const [
@@ -288,13 +284,8 @@ export function DashboardProvider({
 		}
 	}, [isVisible]);
 
-	const handleToggleDashboardSlider = (value: boolean): void => {
-		setIsDashboardSlider(value);
-	};
-
 	const { mutate: lockDashboard } = useMutation(locked, {
 		onSuccess: (_, props) => {
-			setIsDashboardSlider(false);
 			setIsDashboardLocked(props.lock);
 		},
 		onError: (error) => {
@@ -319,9 +310,7 @@ export function DashboardProvider({
 
 	const value: IDashboardContext = useMemo(
 		() => ({
-			isDashboardSliderOpen,
 			isDashboardLocked,
-			handleToggleDashboardSlider,
 			handleDashboardLockToggle,
 			dashboardResponse,
 			selectedDashboard,
@@ -341,7 +330,6 @@ export function DashboardProvider({
 		}),
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[
-			isDashboardSliderOpen,
 			isDashboardLocked,
 			dashboardResponse,
 			selectedDashboard,

frontend/src/providers/Dashboard/helpers/panelTypeSelectionModalHelper.ts

@@ -0,0 +1,18 @@
+import { create } from 'zustand';
+
+interface IPanelTypeSelectionModalState {
+	isPanelTypeSelectionModalOpen: boolean;
+	setIsPanelTypeSelectionModalOpen: (isOpen: boolean) => void;
+}
+
+/**
+ * This helper is used for selecting the panel type when creating a new panel in the dashboard.
+ * It uses Zustand for state management to keep track of whether the panel type selection modal is open or closed.
+ */
+export const usePanelTypeSelectionModalStore = create<IPanelTypeSelectionModalState>(
+	(set) => ({
+		isPanelTypeSelectionModalOpen: false,
+		setIsPanelTypeSelectionModalOpen: (isOpen): void =>
+			set({ isPanelTypeSelectionModalOpen: isOpen }),
+	}),
+);

frontend/src/providers/Dashboard/types.ts

@@ -9,9 +9,7 @@ export type WidgetColumnWidths = {
 };
 
 export interface IDashboardContext {
-	isDashboardSliderOpen: boolean;
 	isDashboardLocked: boolean;
-	handleToggleDashboardSlider: (value: boolean) => void;
 	handleDashboardLockToggle: (value: boolean) => void;
 	dashboardResponse: UseQueryResult<SuccessResponseV2<Dashboard>, unknown>;
 	selectedDashboard: Dashboard | undefined;

pkg/modules/cloudintegration/cloudintegration.go

@@ -4,60 +4,43 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
+	citypes "github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
 	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
 type Module interface {
-	// CreateConnectionArtifact generates cloud provider specific connection information,
-	// client side handles how this information is shown
-	CreateConnectionArtifact(
-		ctx context.Context,
-		orgID valuer.UUID,
-		provider cloudintegrationtypes.CloudProviderType,
-		request *cloudintegrationtypes.ConnectionArtifactRequest,
-	) (*cloudintegrationtypes.ConnectionArtifact, error)
+	CreateAccount(ctx context.Context, account *citypes.Account) error
 
-	// GetAccountStatus returns agent connection status for a cloud integration account
-	GetAccountStatus(ctx context.Context, orgID, accountID valuer.UUID) (*cloudintegrationtypes.AccountStatus, error)
+	// GetAccount returns cloud integration account
+	GetAccount(ctx context.Context, orgID, accountID valuer.UUID) (*citypes.Account, error)
 
-	// ListConnectedAccounts lists accounts where agent is connected
-	ListConnectedAccounts(ctx context.Context, orgID valuer.UUID) (*cloudintegrationtypes.ConnectedAccounts, error)
+	// GetAccounts lists accounts where agent is connected
+	GetAccounts(ctx context.Context, orgID valuer.UUID) ([]*citypes.Account, error)
+
+	// UpdateAccount updates the cloud integration account for a specific organization.
+	UpdateAccount(ctx context.Context, account *citypes.Account) error
 
 	// DisconnectAccount soft deletes/removes a cloud integration account.
 	DisconnectAccount(ctx context.Context, orgID, accountID valuer.UUID) error
 
-	// UpdateAccountConfig updates the configuration of an existing cloud account for a specific organization.
-	UpdateAccountConfig(
-		ctx context.Context,
-		orgID,
-		accountID valuer.UUID,
-		config *cloudintegrationtypes.UpdateAccountConfigRequest,
-	) (*cloudintegrationtypes.Account, error)
+	// GetConnectionArtifact returns cloud provider specific connection information,
+	// client side handles how this information is shown
+	GetConnectionArtifact(ctx context.Context, account *citypes.Account, req *citypes.ConnectionArtifactRequest) (*citypes.ConnectionArtifact, error)
 
-	// ListServicesMetadata returns list of services metadata for a cloud provider attached with the integrationID.
+	// GetServicesMetadata returns list of services metadata for a cloud provider attached with the integrationID.
 	// This just returns a summary of the service and not the whole service definition
-	ListServicesMetadata(ctx context.Context, orgID valuer.UUID, integrationID *valuer.UUID) (*cloudintegrationtypes.ServicesMetadata, error)
+	GetServicesMetadata(ctx context.Context, orgID valuer.UUID, integrationID *valuer.UUID) ([]*citypes.ServiceMetadata, error)
 
 	// GetService returns service definition details for a serviceID. This returns config and
 	// other details required to show in service details page on web client.
-	GetService(ctx context.Context, orgID valuer.UUID, integrationID *valuer.UUID, serviceID string) (*cloudintegrationtypes.Service, error)
+	GetService(ctx context.Context, orgID valuer.UUID, integrationID *valuer.UUID, serviceID string) (*citypes.Service, error)
 
-	// UpdateServiceConfig updates cloud integration service config
-	UpdateServiceConfig(
-		ctx context.Context,
-		orgID valuer.UUID,
-		serviceID string,
-		config *cloudintegrationtypes.UpdateServiceConfigRequest,
-	) (*cloudintegrationtypes.UpdateServiceConfigResponse, error)
+	// UpdateService updates cloud integration service
+	UpdateService(ctx context.Context, orgID valuer.UUID, service *citypes.CloudIntegrationService) error
 
 	// AgentCheckIn is called by agent to heartbeat and get latest config in response.
-	AgentCheckIn(
-		ctx context.Context,
-		orgID valuer.UUID,
-		req *cloudintegrationtypes.AgentCheckInRequest,
-	) (*cloudintegrationtypes.AgentCheckInResponse, error)
+	AgentCheckIn(ctx context.Context, orgID valuer.UUID, req *citypes.AgentCheckInRequest) (*citypes.AgentCheckInResponse, error)
 
 	// GetDashboardByID returns dashboard JSON for a given dashboard id.
 	// this only returns the dashboard when the service (embedded in dashboard id) is enabled
@@ -69,25 +52,14 @@ type Module interface {
 	GetAllDashboards(ctx context.Context, orgID valuer.UUID) ([]*dashboardtypes.Dashboard, error)
 }
 
-// CloudProvider is the interface each cloud provider must implement.
-type CloudProvider interface {
-	CreateArtifact(
-		ctx context.Context,
-		orgID valuer.UUID,
-		request *cloudintegrationtypes.ConnectionArtifactRequest,
-		creds cloudintegrationtypes.SignozCredentials,
-		accountID valuer.UUID,
-	) (artifact *cloudintegrationtypes.ConnectionArtifact, err error)
-}
-
 type Handler interface {
-	AgentCheckIn(http.ResponseWriter, *http.Request)
-	GenerateConnectionArtifact(http.ResponseWriter, *http.Request)
-	ListConnectedAccounts(http.ResponseWriter, *http.Request)
-	GetAccountStatus(http.ResponseWriter, *http.Request)
-	ListServices(http.ResponseWriter, *http.Request)
-	GetServiceDetails(http.ResponseWriter, *http.Request)
-	UpdateAccountConfig(http.ResponseWriter, *http.Request)
-	UpdateServiceConfig(http.ResponseWriter, *http.Request)
+	GetConnectionArtifact(http.ResponseWriter, *http.Request)
+	GetAccounts(http.ResponseWriter, *http.Request)
+	GetAccount(http.ResponseWriter, *http.Request)
+	UpdateAccount(http.ResponseWriter, *http.Request)
 	DisconnectAccount(http.ResponseWriter, *http.Request)
+	GetServicesMetadata(http.ResponseWriter, *http.Request)
+	GetService(http.ResponseWriter, *http.Request)
+	UpdateService(http.ResponseWriter, *http.Request)
+	AgentCheckIn(http.ResponseWriter, *http.Request)
 }

pkg/modules/cloudintegration/implcloudintegration/module.go

@@ -1,61 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type module struct{}
-
-func NewModule() cloudintegration.Module {
-	return &module{}
-}
-
-func (m *module) CreateConnectionArtifact(_ context.Context, _ valuer.UUID, _ cloudintegrationtypes.CloudProviderType, _ *cloudintegrationtypes.ConnectionArtifactRequest) (*cloudintegrationtypes.ConnectionArtifact, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) GetAccountStatus(_ context.Context, _, _ valuer.UUID) (*cloudintegrationtypes.AccountStatus, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) ListConnectedAccounts(_ context.Context, _ valuer.UUID) (*cloudintegrationtypes.ConnectedAccounts, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) DisconnectAccount(_ context.Context, _, _ valuer.UUID) error {
-	return errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) UpdateAccountConfig(_ context.Context, _, _ valuer.UUID, _ *cloudintegrationtypes.UpdateAccountConfigRequest) (*cloudintegrationtypes.Account, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) ListServicesSummary(_ context.Context, _ valuer.UUID, _ *valuer.UUID) (*cloudintegrationtypes.ServicesSummary, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) GetService(_ context.Context, _ valuer.UUID, _ string, _ *valuer.UUID) (*cloudintegrationtypes.Service, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) UpdateServiceConfig(_ context.Context, _ string, _ valuer.UUID, _ *cloudintegrationtypes.UpdateServiceConfigRequest) (*cloudintegrationtypes.ServiceSummary, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) AgentCheckIn(_ context.Context, _ valuer.UUID, _ *cloudintegrationtypes.AgentCheckInRequest) (cloudintegrationtypes.AgentCheckInResponse, error) {
-	return cloudintegrationtypes.AgentCheckInResponse{}, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) GetDashboardByID(_ context.Context, _ string, _ valuer.UUID) (*dashboardtypes.Dashboard, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}
-
-func (m *module) GetAllDashboards(_ context.Context, _ valuer.UUID) ([]*dashboardtypes.Dashboard, error) {
-	return nil, errors.New(errors.TypeUnsupported, errors.CodeUnsupported, "cloud integration is an enterprise feature")
-}

pkg/modules/cloudintegration/implcloudintegration/store.go

@@ -1,118 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type store struct {
-	store sqlstore.SQLStore
-}
-
-func NewStore(sqlStore sqlstore.SQLStore) cloudintegrationtypes.Store {
-	return &store{store: sqlStore}
-}
-
-func (s *store) GetAccountByID(ctx context.Context, orgID, id valuer.UUID, provider cloudintegrationtypes.CloudProviderType) (*cloudintegrationtypes.StorableCloudIntegration, error) {
-	account := new(cloudintegrationtypes.StorableCloudIntegration)
-	err := s.store.BunDB().NewSelect().Model(account).
-		Where("id = ?", id).
-		Where("org_id = ?", orgID).
-		Where("provider = ?", provider).
-		Scan(ctx)
-	if err != nil {
-		return nil, s.store.WrapNotFoundErrf(err, cloudintegrationtypes.ErrCodeCloudIntegrationNotFound, "cloud integration account with id %s not found", id)
-	}
-	return account, nil
-}
-
-func (s *store) UpsertAccount(ctx context.Context, account *cloudintegrationtypes.StorableCloudIntegration) error {
-	account.UpdatedAt = time.Now()
-	_, err := s.store.BunDBCtx(ctx).NewInsert().Model(account).
-		On("CONFLICT (id, provider, org_id) DO UPDATE").
-		Set("config = EXCLUDED.config").
-		Set("account_id = EXCLUDED.account_id").
-		Set("last_agent_report = EXCLUDED.last_agent_report").
-		Set("removed_at = EXCLUDED.removed_at").
-		Set("updated_at = EXCLUDED.updated_at").
-		Exec(ctx)
-	return err
-}
-
-func (s *store) RemoveAccount(ctx context.Context, orgID, id valuer.UUID, provider cloudintegrationtypes.CloudProviderType) error {
-	_, err := s.store.BunDBCtx(ctx).NewUpdate().Model((*cloudintegrationtypes.StorableCloudIntegration)(nil)).
-		Set("removed_at = ?", time.Now()).
-		Where("id = ?", id).
-		Where("org_id = ?", orgID).
-		Where("provider = ?", provider).
-		Exec(ctx)
-	return err
-}
-
-func (s *store) GetConnectedAccounts(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType) ([]*cloudintegrationtypes.StorableCloudIntegration, error) {
-	var accounts []*cloudintegrationtypes.StorableCloudIntegration
-	err := s.store.BunDB().NewSelect().Model(&accounts).
-		Where("org_id = ?", orgID).
-		Where("provider = ?", provider).
-		Where("removed_at IS NULL").
-		Where("account_id IS NOT NULL").
-		Where("last_agent_report IS NOT NULL").
-		Order("created_at ASC").
-		Scan(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return accounts, nil
-}
-
-func (s *store) GetConnectedAccount(ctx context.Context, orgID valuer.UUID, provider cloudintegrationtypes.CloudProviderType, providerAccountID string) (*cloudintegrationtypes.StorableCloudIntegration, error) {
-	account := new(cloudintegrationtypes.StorableCloudIntegration)
-	err := s.store.BunDB().NewSelect().Model(account).
-		Where("org_id = ?", orgID).
-		Where("provider = ?", provider).
-		Where("account_id = ?", providerAccountID).
-		Where("last_agent_report IS NOT NULL").
-		Where("removed_at IS NULL").
-		Scan(ctx)
-	if err != nil {
-		return nil, s.store.WrapNotFoundErrf(err, cloudintegrationtypes.ErrCodeCloudIntegrationNotFound, "connected account with provider account id %s not found", providerAccountID)
-	}
-	return account, nil
-}
-
-func (s *store) GetServiceByType(ctx context.Context, cloudIntegrationID valuer.UUID, serviceType string) (*cloudintegrationtypes.StorableCloudIntegrationService, error) {
-	service := new(cloudintegrationtypes.StorableCloudIntegrationService)
-	err := s.store.BunDB().NewSelect().Model(service).
-		Where("cloud_integration_id = ?", cloudIntegrationID).
-		Where("type = ?", serviceType).
-		Scan(ctx)
-	if err != nil {
-		return nil, s.store.WrapNotFoundErrf(err, cloudintegrationtypes.ErrCodeCloudIntegrationNotFound, "cloud integration service with type %s not found", serviceType)
-	}
-	return service, nil
-}
-
-func (s *store) UpsertService(ctx context.Context, service *cloudintegrationtypes.StorableCloudIntegrationService) error {
-	service.UpdatedAt = time.Now()
-	_, err := s.store.BunDBCtx(ctx).NewInsert().Model(service).
-		On("CONFLICT (cloud_integration_id, type) DO UPDATE").
-		Set("config = EXCLUDED.config").
-		Set("updated_at = EXCLUDED.updated_at").
-		Exec(ctx)
-	return err
-}
-
-func (s *store) GetServices(ctx context.Context, cloudIntegrationID valuer.UUID) ([]*cloudintegrationtypes.StorableCloudIntegrationService, error) {
-	var services []*cloudintegrationtypes.StorableCloudIntegrationService
-	err := s.store.BunDB().NewSelect().Model(&services).
-		Where("cloud_integration_id = ?", cloudIntegrationID).
-		Scan(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return services, nil
-}

pkg/signoz/handler_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory/factorytest"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization/implorganization"
 	"github.com/SigNoz/signoz/pkg/modules/user/impluser"
@@ -51,7 +50,7 @@ func TestNewHandlers(t *testing.T) {
 
 	userGetter := impluser.NewGetter(impluser.NewStore(sqlstore, providerSettings), flagger)
 
-	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, nil, nil, nil, nil, nil, nil, nil, queryParser, Config{}, dashboardModule, userGetter, implcloudintegration.NewModule())
+	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, nil, nil, nil, nil, nil, nil, nil, queryParser, Config{}, dashboardModule, userGetter)
 
 	querierHandler := querier.NewHandler(providerSettings, nil, nil)
 	handlers := NewHandlers(modules, providerSettings, nil, querierHandler, nil, nil, nil, nil, nil, nil, nil)

pkg/signoz/module.go

@@ -12,7 +12,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/apdex/implapdex"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain/implauthdomain"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer/implmetricsexplorer"
@@ -52,25 +51,24 @@ import (
 )
 
 type Modules struct {
-	OrgGetter        organization.Getter
-	OrgSetter        organization.Setter
-	Preference       preference.Module
-	User             user.Module
-	UserGetter       user.Getter
-	SavedView        savedview.Module
-	Apdex            apdex.Module
-	Dashboard        dashboard.Module
-	QuickFilter      quickfilter.Module
-	TraceFunnel      tracefunnel.Module
-	RawDataExport    rawdataexport.Module
-	AuthDomain       authdomain.Module
-	Session          session.Module
-	Services         services.Module
-	SpanPercentile   spanpercentile.Module
-	MetricsExplorer  metricsexplorer.Module
-	Promote          promote.Module
-	ServiceAccount   serviceaccount.Module
-	CloudIntegration cloudintegration.Module
+	OrgGetter       organization.Getter
+	OrgSetter       organization.Setter
+	Preference      preference.Module
+	User            user.Module
+	UserGetter      user.Getter
+	SavedView       savedview.Module
+	Apdex           apdex.Module
+	Dashboard       dashboard.Module
+	QuickFilter     quickfilter.Module
+	TraceFunnel     tracefunnel.Module
+	RawDataExport   rawdataexport.Module
+	AuthDomain      authdomain.Module
+	Session         session.Module
+	Services        services.Module
+	SpanPercentile  spanpercentile.Module
+	MetricsExplorer metricsexplorer.Module
+	Promote         promote.Module
+	ServiceAccount  serviceaccount.Module
 }
 
 func NewModules(
@@ -91,7 +89,6 @@ func NewModules(
 	config Config,
 	dashboard dashboard.Module,
 	userGetter user.Getter,
-	cloudIntegration cloudintegration.Module,
 ) Modules {
 	quickfilter := implquickfilter.NewModule(implquickfilter.NewStore(sqlstore))
 	orgSetter := implorganization.NewSetter(implorganization.NewStore(sqlstore), alertmanager, quickfilter)
@@ -99,24 +96,23 @@ func NewModules(
 	ruleStore := sqlrulestore.NewRuleStore(sqlstore, queryParser, providerSettings)
 
 	return Modules{
-		OrgGetter:        orgGetter,
-		OrgSetter:        orgSetter,
-		Preference:       implpreference.NewModule(implpreference.NewStore(sqlstore), preferencetypes.NewAvailablePreference()),
-		SavedView:        implsavedview.NewModule(sqlstore),
-		Apdex:            implapdex.NewModule(sqlstore),
-		Dashboard:        dashboard,
-		User:             user,
-		UserGetter:       userGetter,
-		QuickFilter:      quickfilter,
-		TraceFunnel:      impltracefunnel.NewModule(impltracefunnel.NewStore(sqlstore)),
-		RawDataExport:    implrawdataexport.NewModule(querier),
-		AuthDomain:       implauthdomain.NewModule(implauthdomain.NewStore(sqlstore), authNs),
-		Session:          implsession.NewModule(providerSettings, authNs, user, userGetter, implauthdomain.NewModule(implauthdomain.NewStore(sqlstore), authNs), tokenizer, orgGetter),
-		SpanPercentile:   implspanpercentile.NewModule(querier, providerSettings),
-		Services:         implservices.NewModule(querier, telemetryStore),
-		MetricsExplorer:  implmetricsexplorer.NewModule(telemetryStore, telemetryMetadataStore, cache, ruleStore, dashboard, providerSettings, config.MetricsExplorer),
-		Promote:          implpromote.NewModule(telemetryMetadataStore, telemetryStore),
-		ServiceAccount:   implserviceaccount.NewModule(implserviceaccount.NewStore(sqlstore), authz, emailing, providerSettings),
-		CloudIntegration: cloudIntegration,
+		OrgGetter:       orgGetter,
+		OrgSetter:       orgSetter,
+		Preference:      implpreference.NewModule(implpreference.NewStore(sqlstore), preferencetypes.NewAvailablePreference()),
+		SavedView:       implsavedview.NewModule(sqlstore),
+		Apdex:           implapdex.NewModule(sqlstore),
+		Dashboard:       dashboard,
+		User:            user,
+		UserGetter:      userGetter,
+		QuickFilter:     quickfilter,
+		TraceFunnel:     impltracefunnel.NewModule(impltracefunnel.NewStore(sqlstore)),
+		RawDataExport:   implrawdataexport.NewModule(querier),
+		AuthDomain:      implauthdomain.NewModule(implauthdomain.NewStore(sqlstore), authNs),
+		Session:         implsession.NewModule(providerSettings, authNs, user, userGetter, implauthdomain.NewModule(implauthdomain.NewStore(sqlstore), authNs), tokenizer, orgGetter),
+		SpanPercentile:  implspanpercentile.NewModule(querier, providerSettings),
+		Services:        implservices.NewModule(querier, telemetryStore),
+		MetricsExplorer: implmetricsexplorer.NewModule(telemetryStore, telemetryMetadataStore, cache, ruleStore, dashboard, providerSettings, config.MetricsExplorer),
+		Promote:         implpromote.NewModule(telemetryMetadataStore, telemetryStore),
+		ServiceAccount:  implserviceaccount.NewModule(implserviceaccount.NewStore(sqlstore), authz, emailing, providerSettings),
 	}
 }

pkg/signoz/module_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory/factorytest"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization/implorganization"
 	"github.com/SigNoz/signoz/pkg/modules/user/impluser"
@@ -50,7 +49,7 @@ func TestNewModules(t *testing.T) {
 
 	userGetter := impluser.NewGetter(impluser.NewStore(sqlstore, providerSettings), flagger)
 
-	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, nil, nil, nil, nil, nil, nil, nil, queryParser, Config{}, dashboardModule, userGetter, implcloudintegration.NewModule())
+	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, nil, nil, nil, nil, nil, nil, nil, queryParser, Config{}, dashboardModule, userGetter)
 
 	reflectVal := reflect.ValueOf(modules)
 	for i := 0; i < reflectVal.NumField(); i++ {

pkg/signoz/signoz.go

@@ -18,7 +18,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/gateway"
 	"github.com/SigNoz/signoz/pkg/instrumentation"
 	"github.com/SigNoz/signoz/pkg/licensing"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/organization/implorganization"
@@ -44,7 +43,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/version"
 	"github.com/SigNoz/signoz/pkg/zeus"
 
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/web"
 )
 
@@ -93,7 +91,6 @@ func New(
 	dashboardModuleCallback func(sqlstore.SQLStore, factory.ProviderSettings, analytics.Analytics, organization.Getter, queryparser.QueryParser, querier.Querier, licensing.Licensing) dashboard.Module,
 	gatewayProviderFactory func(licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config],
 	querierHandlerCallback func(factory.ProviderSettings, querier.Querier, analytics.Analytics) querier.Handler,
-	cloudIntegrationModuleCallback func(sqlstore.SQLStore, licensing.Licensing, zeus.Zeus, gateway.Gateway, global.Config) cloudintegration.Module,
 ) (*SigNoz, error) {
 	// Initialize instrumentation
 	instrumentation, err := instrumentation.New(ctx, config.Instrumentation, version.Info, "signoz")
@@ -390,11 +387,8 @@ func New(
 		return nil, err
 	}
 
-	// Initialize cloudintegration module via callback
-	cloudIntegrationModule := cloudIntegrationModuleCallback(sqlstore, licensing, zeus, gateway, config.Global)
-
 	// Initialize all modules
-	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, analytics, querier, telemetrystore, telemetryMetadataStore, authNs, authz, cache, queryParser, config, dashboard, userGetter, cloudIntegrationModule)
+	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, analytics, querier, telemetrystore, telemetryMetadataStore, authNs, authz, cache, queryParser, config, dashboard, userGetter)
 
 	userService := impluser.NewService(providerSettings, impluser.NewStore(sqlstore, providerSettings), modules.User, orgGetter, authz, config.User.Root)
 

pkg/types/cloudintegrationtypes/account.go

@@ -3,35 +3,31 @@ package cloudintegrationtypes
 import (
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
-type (
-	ConnectedAccounts struct {
-		Accounts []*Account `json:"accounts"`
-	}
-
-	GettableConnectedAccounts = ConnectedAccounts
-
-	UpdateAccountConfigRequest struct {
-		AWS *AWSAccountConfig `json:"aws"`
-	}
-
-	UpdatableAccountConfig = UpdateAccountConfigRequest
-)
-
 type (
 	Account struct {
-		Id                string            `json:"id"`
+		types.Identifiable
+		types.TimeAuditable
 		ProviderAccountId *string           `json:"providerAccountID,omitempty"`
 		Provider          CloudProviderType `json:"provider"`
 		RemovedAt         *time.Time        `json:"removedAt,omitempty"`
 		AgentReport       *AgentReport      `json:"agentReport,omitempty"`
 		OrgID             valuer.UUID       `json:"orgID"`
-		Config            *AccountConfig    `json:"accountConfig,omitempty"`
+		Config            *AccountConfig    `json:"config,omitempty"`
+	}
+
+	GettableConnectedAccounts struct {
+		Accounts []*Account `json:"accounts"`
 	}
 
 	GettableAccount = Account
+
+	UpdatableAccount struct {
+		Config *AccountConfig `json:"config"`
+	}
 )
 
 // AgentReport represents heartbeats sent by the agent.

pkg/types/cloudintegrationtypes/cloudintegration.go

@@ -26,10 +26,10 @@ type StorableCloudIntegration struct {
 	Provider CloudProviderType `json:"provider" bun:"provider,type:text"`
 	// Config is provider specific data in JSON string format
 	Config          string               `json:"config" bun:"config,type:text"`
-	AccountID       *string              `json:"account_id" bun:"account_id,type:text"`
-	LastAgentReport *StorableAgentReport `json:"last_agent_report" bun:"last_agent_report,type:text"`
-	RemovedAt       *time.Time           `json:"removed_at" bun:"removed_at,type:timestamp,nullzero"`
-	OrgID           valuer.UUID          `bun:"org_id,type:text"`
+	AccountID       *string              `json:"accountID" bun:"account_id,type:text"`
+	LastAgentReport *StorableAgentReport `json:"lastAgentReport" bun:"last_agent_report,type:text"`
+	RemovedAt       *time.Time           `json:"removedAt" bun:"removed_at,type:timestamp,nullzero"`
+	OrgID           valuer.UUID          `json:"orgID" bun:"org_id,type:text"`
 }
 
 // StorableAgentReport represents the last heartbeat and arbitrary data sent by the agent
@@ -45,10 +45,11 @@ type StorableCloudIntegrationService struct {
 
 	types.Identifiable
 	types.TimeAuditable
-	Type valuer.String `bun:"type,type:text,notnull,unique:cloud_integration_id_type"`
+	// Keeping Type field name as is, but it is a service id
+	Type ServiceID `bun:"type,type:text,notnull,unique:cloud_integration_id_type"`
 	// Config is cloud provider's service specific data in JSON string format
 	Config             string      `bun:"config,type:text"`
-	CloudIntegrationID valuer.UUID `bun:"cloud_integration_id,type:text,notnull,unique:cloud_integration_id_type,references:cloud_integration(id),on_delete:cascade"`
+	CloudIntegrationID valuer.UUID `bun:"cloud_integration_id,type:text,notnull,unique:cloud_integration_id_type,on_delete:cascade"`
 }
 
 // Scan scans value from DB.

pkg/types/cloudintegrationtypes/connection.go

@@ -17,14 +17,6 @@ type (
 )
 
 type (
-	// SignozCredentials is used to configure Agents to connect with Signoz
-	SignozCredentials struct {
-		SigNozAPIUrl string
-		SigNozAPIKey string // PAT
-		IngestionUrl string
-		IngestionKey string
-	}
-
 	ConnectionArtifact struct {
 		Aws *AWSConnectionArtifact `json:"aws"`
 	}
@@ -70,6 +62,7 @@ type (
 	GettableAgentCheckInResponse struct {
 		AgentCheckInResponse
 
+		// For backward compatibility
 		CloudIntegrationId string `json:"cloud_integration_id"`
 		AccountId          string `json:"account_id"`
 	}

pkg/types/cloudintegrationtypes/regions.go

@@ -5,8 +5,8 @@ import (
 )
 
 var (
-	CodeInvalidCloudRegion    = errors.MustNewCode("invalid_cloud_region")
-	CodeMismatchCloudProvider = errors.MustNewCode("cloud_provider_mismatch")
+	ErrCodeInvalidCloudRegion    = errors.MustNewCode("invalid_cloud_region")
+	ErrCodeMismatchCloudProvider = errors.MustNewCode("cloud_provider_mismatch")
 )
 
 // List of all valid cloud regions on Amazon Web Services.

pkg/types/cloudintegrationtypes/service.go

@@ -4,16 +4,27 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
-var S3Sync = valuer.NewString("s3sync")
+var (
+	S3Sync = valuer.NewString("s3sync")
+	// ErrCodeInvalidServiceID is the error code for invalid service id.
+	ErrCodeInvalidServiceID = errors.MustNewCode("invalid_service_id")
+)
 
 type (
-	ServicesMetadata struct {
-		Services []*ServiceMetadata `json:"services"`
+	ServiceID struct{ valuer.String }
+
+	CloudIntegrationService struct {
+		types.Identifiable
+		types.TimeAuditable
+		Type               ServiceID      `json:"type"`
+		Config             *ServiceConfig `json:"config"`
+		CloudIntegrationID valuer.UUID    `json:"cloudIntegrationID"`
 	}
 
 	// ServiceMetadata helps to quickly list available services and whether it is enabled or not.
@@ -25,7 +36,9 @@ type (
 		Enabled bool `json:"enabled"`
 	}
 
-	GettableServicesMetadata = ServicesMetadata
+	GettableServicesMetadata struct {
+		Services []*ServiceMetadata `json:"services"`
+	}
 
 	Service struct {
 		ServiceDefinition
@@ -34,15 +47,8 @@ type (
 
 	GettableService = Service
 
-	UpdateServiceConfigRequest struct {
-		CloudIntegrationId valuer.UUID    `json:"cloudIntegrationId"`
-		ServiceConfig      *ServiceConfig `json:"serviceConfig"`
-	}
-
-	UpdateServiceConfigResponse struct {
-		Id                 string         `json:"id"` // service id
-		CloudIntegrationId valuer.UUID    `json:"cloudIntegrationId"`
-		ServiceConfig      *ServiceConfig `json:"serviceConfig"`
+	UpdatableService struct {
+		Config *ServiceConfig `json:"config"`
 	}
 )
 
@@ -66,7 +72,7 @@ type AWSServiceMetricsConfig struct {
 	Enabled bool `json:"enabled"`
 }
 
-// DefinitionMetadata represents service definition metadata. This is useful for showing service overview.
+// ServiceDefinitionMetadata represents service definition metadata. This is useful for showing service tab in frontend.
 type ServiceDefinitionMetadata struct {
 	Id    string `json:"id"`
 	Title string `json:"title"`
@@ -163,16 +169,47 @@ type AWSLogsStrategy struct {
 
 // Dashboard represents a dashboard definition for cloud integration.
 // This is used to show available pre-made dashboards for a service,
-// hence has additional fields like name and description and url for redirection to the right dashboard on click.
+// hence has additional fields like id, title and description
 type Dashboard struct {
 	Id          string                               `json:"id"`
-	Url         string                               `json:"url"`
 	Title       string                               `json:"title"`
 	Description string                               `json:"description"`
-	Image       string                               `json:"image"`
 	Definition  dashboardtypes.StorableDashboardData `json:"definition,omitempty"`
 }
 
+// SupportedServices is the map of supported services for each cloud provider.
+var SupportedServices = map[CloudProviderType][]ServiceID{
+	CloudProviderTypeAWS: {
+		{valuer.NewString("alb")},
+		{valuer.NewString("api-gateway")},
+		{valuer.NewString("dynamodb")},
+		{valuer.NewString("ec2")},
+		{valuer.NewString("ecs")},
+		{valuer.NewString("eks")},
+		{valuer.NewString("elasticache")},
+		{valuer.NewString("lambda")},
+		{valuer.NewString("msk")},
+		{valuer.NewString("rds")},
+		{valuer.NewString("s3sync")},
+		{valuer.NewString("sns")},
+		{valuer.NewString("sqs")},
+	},
+}
+
+// NewServiceID returns a new ServiceID from a string, validated against the supported services for the given cloud provider.
+func NewServiceID(provider CloudProviderType, service string) (ServiceID, error) {
+	services, ok := SupportedServices[provider]
+	if !ok {
+		return ServiceID{}, errors.NewInvalidInputf(ErrCodeInvalidServiceID, "no services defined for cloud provider: %s", provider)
+	}
+	for _, s := range services {
+		if s.StringValue() == service {
+			return s, nil
+		}
+	}
+	return ServiceID{}, errors.NewInvalidInputf(ErrCodeInvalidServiceID, "invalid service id %q for cloud provider %s", service, provider)
+}
+
 // UTILS
 
 // GetCloudIntegrationDashboardID returns the dashboard id for a cloud integration, given the cloud provider, service id, and dashboard id.

pkg/types/cloudintegrationtypes/store.go

@@ -11,7 +11,7 @@ type Store interface {
 	GetAccountByID(ctx context.Context, orgID, id valuer.UUID, provider CloudProviderType) (*StorableCloudIntegration, error)
 
 	// CreateAccount creates a new cloud integration account
-	CreateAccount(ctx context.Context, orgID valuer.UUID, account *StorableCloudIntegration) (*StorableCloudIntegration, error)
+	CreateAccount(ctx context.Context, account *StorableCloudIntegration) (*StorableCloudIntegration, error)
 
 	// UpdateAccount updates an existing cloud integration account
 	UpdateAccount(ctx context.Context, account *StorableCloudIntegration) error
@@ -22,19 +22,19 @@ type Store interface {
 	// GetConnectedAccounts returns all the cloud integration accounts for the org and cloud provider
 	GetConnectedAccounts(ctx context.Context, orgID valuer.UUID, provider CloudProviderType) ([]*StorableCloudIntegration, error)
 
-	// GetConnectedAccount for given provider
+	// GetConnectedAccount for a given provider
 	GetConnectedAccount(ctx context.Context, orgID valuer.UUID, provider CloudProviderType, providerAccountID string) (*StorableCloudIntegration, error)
 
 	// cloud_integration_service related methods
 
-	// GetServiceByType returns the cloud integration service for the given cloud integration id and service type
-	GetServiceByType(ctx context.Context, cloudIntegrationID valuer.UUID, serviceType string) (*StorableCloudIntegrationService, error)
+	// GetServiceByServiceID returns the cloud integration service for the given cloud integration id and service id
+	GetServiceByServiceID(ctx context.Context, cloudIntegrationID valuer.UUID, serviceID ServiceID) (*StorableCloudIntegrationService, error)
 
-	// CreateService creates a new cloud integration service for the given cloud integration id and service type
-	CreateService(ctx context.Context, cloudIntegrationID valuer.UUID, service *StorableCloudIntegrationService) (*StorableCloudIntegrationService, error)
+	// CreateService creates a new cloud integration service
+	CreateService(ctx context.Context, service *StorableCloudIntegrationService) (*StorableCloudIntegrationService, error)
 
-	// UpdateService updates an existing cloud integration service for the given cloud integration id and service type
-	UpdateService(ctx context.Context, cloudIntegrationID valuer.UUID, service *StorableCloudIntegrationService) error
+	// UpdateService updates an existing cloud integration service
+	UpdateService(ctx context.Context, service *StorableCloudIntegrationService) error
 
 	// GetServices returns all the cloud integration services for the given cloud integration id
 	GetServices(ctx context.Context, cloudIntegrationID valuer.UUID) ([]*StorableCloudIntegrationService, error)

pkg/types/zeustypes/types.go

@@ -1,10 +1,8 @@
 package zeustypes
 
 import (
-	"fmt"
 	"net/url"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/tidwall/gjson"
 )
 
@@ -37,27 +35,6 @@ type Host struct {
 	URL       string `json:"url" required:"true"`
 }
 
-// GettableDeployment represents the parsed deployment info from zeus.GetDeployment.
-type GettableDeployment struct {
-	Name         string
-	SignozAPIUrl string
-}
-
-// NewGettableDeployment parses raw GetDeployment bytes into a GettableDeployment.
-func NewGettableDeployment(data []byte) (*GettableDeployment, error) {
-	parsed := gjson.ParseBytes(data)
-	name := parsed.Get("name").String()
-	dns := parsed.Get("cluster.region.dns").String()
-	if name == "" || dns == "" {
-		return nil, errors.NewInternalf(errors.CodeInternal,
-			"deployment info response missing name or cluster region dns")
-	}
-	return &GettableDeployment{
-		Name:         name,
-		SignozAPIUrl: fmt.Sprintf("https://%s.%s", name, dns),
-	}, nil
-}
-
 func NewGettableHost(data []byte) *GettableHost {
 	parsed := gjson.ParseBytes(data)
 	dns := parsed.Get("cluster.region.dns").String()