Merge branch 'main' into feat/table-escape-char-support

docs/api/openapi.yml

@@ -2698,37 +2698,6 @@ components:
       - name
       - expiresAt
       type: object
-    SystemdashboardtypesData:
-      additionalProperties: {}
-      type: object
-    SystemdashboardtypesGettableSystemDashboard:
-      properties:
-        created_at:
-          format: date-time
-          type: string
-        data:
-          $ref: '#/components/schemas/SystemdashboardtypesData'
-        id:
-          type: string
-        source:
-          type: string
-        updated_at:
-          format: date-time
-          type: string
-      required:
-      - id
-      - source
-      - data
-      - created_at
-      - updated_at
-      type: object
-    SystemdashboardtypesUpdatableSystemDashboard:
-      properties:
-        data:
-          $ref: '#/components/schemas/SystemdashboardtypesData'
-      required:
-      - data
-      type: object
     TelemetrytypesFieldContext:
       enum:
       - metric
@@ -6465,133 +6434,6 @@ paths:
       summary: Updates my service account
       tags:
       - serviceaccount
-  /api/v1/system/{source}/dashboard:
-    get:
-      deprecated: false
-      description: Returns the system dashboard for the given source. Seeds default
-        panels on the first call if no dashboard exists yet.
-      operationId: GetSystemDashboard
-      parameters:
-      - in: path
-        name: source
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/SystemdashboardtypesGettableSystemDashboard'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - VIEWER
-      - tokenizer:
-        - VIEWER
-      summary: Get a system dashboard
-      tags:
-      - system-dashboard
-    put:
-      deprecated: false
-      description: Replaces the panels, layout, and variables of a system dashboard.
-      operationId: UpdateSystemDashboard
-      parameters:
-      - in: path
-        name: source
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/SystemdashboardtypesUpdatableSystemDashboard'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/SystemdashboardtypesGettableSystemDashboard'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - EDITOR
-      - tokenizer:
-        - EDITOR
-      summary: Update a system dashboard
-      tags:
-      - system-dashboard
   /api/v1/user:
     get:
       deprecated: false

frontend/src/components/Logs/TableView/styles.ts

@@ -22,6 +22,7 @@ export const TableBodyContent = styled.div<TableBodyContentProps>`
 	-webkit-line-clamp: ${(props): number => props.linesPerRow};
 	line-clamp: ${(props): number => props.linesPerRow};
 	-webkit-box-orient: vertical;
+	white-space: pre-wrap;
 	${({ fontSize }): string =>
 		fontSize === FontSize.SMALL
 			? `font-size:11px; line-height:16px;`

pkg/apiserver/signozapiserver/provider.go

@@ -22,7 +22,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/rawdataexport"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
-	"github.com/SigNoz/signoz/pkg/modules/systemdashboard"
 	"github.com/SigNoz/signoz/pkg/modules/session"
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
@@ -58,7 +57,6 @@ type provider struct {
 	factoryHandler          factory.Handler
 	cloudIntegrationHandler cloudintegration.Handler
 	ruleStateHistoryHandler rulestatehistory.Handler
-	systemDashboardHandler  systemdashboard.Handler
 }
 
 func NewFactory(
@@ -85,7 +83,6 @@ func NewFactory(
 	factoryHandler factory.Handler,
 	cloudIntegrationHandler cloudintegration.Handler,
 	ruleStateHistoryHandler rulestatehistory.Handler,
-	systemDashboardHandler  systemdashboard.Handler,
 ) factory.ProviderFactory[apiserver.APIServer, apiserver.Config] {
 	return factory.NewProviderFactory(factory.MustNewName("signoz"), func(ctx context.Context, providerSettings factory.ProviderSettings, config apiserver.Config) (apiserver.APIServer, error) {
 		return newProvider(
@@ -115,7 +112,6 @@ func NewFactory(
 			factoryHandler,
 			cloudIntegrationHandler,
 			ruleStateHistoryHandler,
-			systemDashboardHandler,
 		)
 	})
 }
@@ -147,7 +143,6 @@ func newProvider(
 	factoryHandler factory.Handler,
 	cloudIntegrationHandler cloudintegration.Handler,
 	ruleStateHistoryHandler rulestatehistory.Handler,
-	systemDashboardHandler  systemdashboard.Handler,
 ) (apiserver.APIServer, error) {
 	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/apiserver/signozapiserver")
 	router := mux.NewRouter().UseEncodedPath()
@@ -177,7 +172,6 @@ func newProvider(
 		factoryHandler:          factoryHandler,
 		cloudIntegrationHandler: cloudIntegrationHandler,
 		ruleStateHistoryHandler: ruleStateHistoryHandler,
-		systemDashboardHandler:  systemDashboardHandler,
 	}
 
 	provider.authZ = middleware.NewAuthZ(settings.Logger(), orgGetter, authz)
@@ -278,10 +272,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addSystemDashboardRoutes(router); err != nil {
-		return err
-	}
-
 	return nil
 }
 

pkg/apiserver/signozapiserver/systemdashboard.go

@@ -1,54 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/systemdashboardtypes"
-	"github.com/gorilla/mux"
-)
-
-func (provider *provider) addSystemDashboardRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v1/system/{source}/dashboard", handler.New(
-		provider.authZ.ViewAccess(provider.systemDashboardHandler.Get),
-		handler.OpenAPIDef{
-			ID:                  "GetSystemDashboard",
-			Tags:                []string{"system-dashboard"},
-			Summary:             "Get a system dashboard",
-			Description:         "Returns the system dashboard for the given source. Seeds default panels on the first call if no dashboard exists yet.",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(systemdashboardtypes.GettableSystemDashboard),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/system/{source}/dashboard", handler.New(
-		provider.authZ.EditAccess(provider.systemDashboardHandler.Update),
-		handler.OpenAPIDef{
-			ID:                  "UpdateSystemDashboard",
-			Tags:                []string{"system-dashboard"},
-			Summary:             "Update a system dashboard",
-			Description:         "Replaces the panels, layout, and variables of a system dashboard.",
-			Request:             new(systemdashboardtypes.UpdatableSystemDashboard),
-			RequestContentType:  "application/json",
-			Response:            new(systemdashboardtypes.GettableSystemDashboard),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleEditor),
-		},
-	)).Methods(http.MethodPut).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/modules/systemdashboard/implsystemdashboard/handler.go

@@ -1,103 +0,0 @@
-package implsystemdashboard
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/http/binding"
-	"github.com/SigNoz/signoz/pkg/http/render"
-	"github.com/SigNoz/signoz/pkg/modules/systemdashboard"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/systemdashboardtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/gorilla/mux"
-)
-
-type handler struct {
-	module           systemdashboard.Module
-	providerSettings factory.ProviderSettings
-}
-
-func NewHandler(module systemdashboard.Module, providerSettings factory.ProviderSettings) systemdashboard.Handler {
-	return &handler{module: module, providerSettings: providerSettings}
-}
-
-func (h *handler) Get(rw http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	orgID, err := valuer.NewUUID(claims.OrgID)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	source, err := sourceFromPath(r)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	dashboard, err := h.module.Get(ctx, orgID, source)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, systemdashboardtypes.NewGettableSystemDashboard(dashboard))
-}
-
-func (h *handler) Update(rw http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	orgID, err := valuer.NewUUID(claims.OrgID)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	source, err := sourceFromPath(r)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	req := new(systemdashboardtypes.UpdatableSystemDashboard)
-	if err := binding.JSON.BindBody(r.Body, req); err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	dashboard, err := h.module.Update(ctx, orgID, source, claims.Email, req)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, systemdashboardtypes.NewGettableSystemDashboard(dashboard))
-}
-
-// sourceFromPath extracts the {source} path variable.
-func sourceFromPath(r *http.Request) (string, error) {
-	source := mux.Vars(r)["source"]
-	if source == "" {
-		return "", errors.Newf(errors.TypeInvalidInput, systemdashboardtypes.ErrCodeSystemDashboardInvalidInput, "source is missing from the path")
-	}
-	return source, nil
-}

pkg/modules/systemdashboard/systemdashboard.go

@@ -1,24 +0,0 @@
-package systemdashboard
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/types/systemdashboardtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-// System dashboards are pre-seeded, org-scoped dashboards identified by a source
-type Module interface {
-	// Get returns the system dashboard for the given org and source,
-	// seeding default panels if the dashboard does not yet exist.
-	Get(ctx context.Context, orgID valuer.UUID, source string) (*systemdashboardtypes.SystemDashboard, error)
-
-	// Update replaces the data blob of an existing system dashboard.
-	Update(ctx context.Context, orgID valuer.UUID, source string, updatedBy string, req *systemdashboardtypes.UpdatableSystemDashboard) (*systemdashboardtypes.SystemDashboard, error)
-}
-
-type Handler interface {
-	Get(rw http.ResponseWriter, r *http.Request)
-	Update(rw http.ResponseWriter, r *http.Request)
-}

pkg/signoz/handler.go

@@ -26,7 +26,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/rawdataexport/implrawdataexport"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory/implrulestatehistory"
-	"github.com/SigNoz/signoz/pkg/modules/systemdashboard"
 	"github.com/SigNoz/signoz/pkg/modules/savedview"
 	"github.com/SigNoz/signoz/pkg/modules/savedview/implsavedview"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
@@ -63,7 +62,6 @@ type Handlers struct {
 	RegistryHandler         factory.Handler
 	CloudIntegrationHandler cloudintegration.Handler
 	RuleStateHistory        rulestatehistory.Handler
-	SystemDashboardHandler  systemdashboard.Handler
 }
 
 func NewHandlers(

pkg/signoz/openapi.go

@@ -27,7 +27,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/rawdataexport"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
-	"github.com/SigNoz/signoz/pkg/modules/systemdashboard"
 	"github.com/SigNoz/signoz/pkg/modules/session"
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
@@ -70,7 +69,6 @@ func NewOpenAPI(ctx context.Context, instrumentation instrumentation.Instrumenta
 		struct{ factory.Handler }{},
 		struct{ cloudintegration.Handler }{},
 		struct{ rulestatehistory.Handler }{},
-		struct{ systemdashboard.Handler }{},
 	).New(ctx, instrumentation.ToProviderSettings(), apiserver.Config{})
 	if err != nil {
 		return nil, err

pkg/signoz/provider.go

@@ -288,7 +288,6 @@ func NewAPIServerProviderFactories(orgGetter organization.Getter, authz authz.Au
 			handlers.RegistryHandler,
 			handlers.CloudIntegrationHandler,
 			handlers.RuleStateHistory,
-			handlers.SystemDashboardHandler,
 		),
 	)
 }

pkg/types/systemdashboardtypes/dashboard.go

@@ -1,113 +0,0 @@
-package systemdashboardtypes
-
-import (
-	"database/sql/driver"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/uptrace/bun"
-)
-
-// Data is the panel + layout + variables blob for a system dashboard.
-// It uses the same format as dashboard.data so the frontend can render it
-// with the existing dashboard component. Stored as a JSON text column.
-type Data map[string]any
-
-func (d Data) Value() (driver.Value, error) {
-	if d == nil {
-		return "{}", nil
-	}
-	b, err := json.Marshal(d)
-	if err != nil {
-		return nil, err
-	}
-	return string(b), nil
-}
-
-func (d *Data) Scan(src any) error {
-	var raw []byte
-	switch v := src.(type) {
-	case string:
-		raw = []byte(v)
-	case []byte:
-		raw = v
-	case nil:
-		*d = Data{}
-		return nil
-	default:
-		return fmt.Errorf("systemdashboardtypes: cannot scan %T into Data", src)
-	}
-	return json.Unmarshal(raw, d)
-}
-
-// StorableSystemDashboard is the bun/DB representation of a system dashboard.
-// Each (org_id, source) pair is unique — the source identifies which pre-seeded
-// page the dashboard belongs to (e.g. "ai-o11y-overview", "service-overview").
-type StorableSystemDashboard struct {
-	bun.BaseModel `bun:"table:system_dashboard,alias:system_dashboard"`
-
-	types.Identifiable
-	types.TimeAuditable
-
-	OrgID  valuer.UUID `bun:"org_id,type:text,notnull"`
-	Source string      `bun:"source,type:text,notnull"`
-	Data   Data        `bun:"data,type:text,notnull"`
-}
-
-// SystemDashboard is the domain model for a system dashboard.
-type SystemDashboard struct {
-	types.TimeAuditable
-
-	ID     string
-	OrgID  valuer.UUID
-	Source string
-	Data   Data
-}
-
-// NewSystemDashboardFromStorable converts a StorableSystemDashboard to a SystemDashboard.
-func NewSystemDashboardFromStorable(s *StorableSystemDashboard) *SystemDashboard {
-	data := make(Data, len(s.Data))
-	for k, v := range s.Data {
-		data[k] = v
-	}
-	return &SystemDashboard{
-		TimeAuditable: s.TimeAuditable,
-		ID:            s.ID.StringValue(),
-		OrgID:         s.OrgID,
-		Source:        s.Source,
-		Data:          data,
-	}
-}
-
-// GettableSystemDashboard is the HTTP response representation of a system dashboard.
-type GettableSystemDashboard struct {
-	ID        string    `json:"id"         required:"true"`
-	Source    string    `json:"source"     required:"true"`
-	Data      Data      `json:"data"       required:"true"`
-	CreatedAt time.Time `json:"created_at" required:"true"`
-	UpdatedAt time.Time `json:"updated_at" required:"true"`
-}
-
-// NewGettableSystemDashboard converts a domain SystemDashboard to a GettableSystemDashboard.
-func NewGettableSystemDashboard(d *SystemDashboard) *GettableSystemDashboard {
-	data := make(Data, len(d.Data))
-	for k, v := range d.Data {
-		data[k] = v
-	}
-	return &GettableSystemDashboard{
-		ID:        d.ID,
-		Source:    d.Source,
-		Data:      data,
-		CreatedAt: d.CreatedAt,
-		UpdatedAt: d.UpdatedAt,
-	}
-}
-
-// UpdatableSystemDashboard is the HTTP request body for updating a system dashboard.
-// The entire data blob is replaced on PUT.
-type UpdatableSystemDashboard struct {
-	Data Data `json:"data" required:"true"`
-}

pkg/types/systemdashboardtypes/errors.go

@@ -1,9 +0,0 @@
-package systemdashboardtypes
-
-import "github.com/SigNoz/signoz/pkg/errors"
-
-var (
-	ErrCodeSystemDashboardNotFound     = errors.MustNewCode("system_dashboard_not_found")
-	ErrCodeSystemDashboardInvalidInput = errors.MustNewCode("system_dashboard_invalid_input")
-	ErrCodeSystemDashboardInvalidData  = errors.MustNewCode("system_dashboard_invalid_data")
-)

pkg/types/systemdashboardtypes/store.go

@@ -1,13 +0,0 @@
-package systemdashboardtypes
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type Store interface {
-	Get(ctx context.Context, orgID valuer.UUID, source string) (*StorableSystemDashboard, error)
-	Create(ctx context.Context, dashboard *StorableSystemDashboard) error
-	Update(ctx context.Context, dashboard *StorableSystemDashboard) error
-}