Skip to content

Commit fe7e519

Browse files
nikhilmantri0902nikhilmantri0902
committed
chore: conflicts resolved
2 parents fe5391e + 44f0094 commit fe7e519

File tree

150 files changed

+11561
-1551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+11561
-1551
lines changed

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,11 @@
33
# that they own.
44

55
/frontend/ @YounixM @aks07
6-
/frontend/src/container/MetricsApplication @srikanthccv
7-
/frontend/src/container/NewWidget/RightContainer/types.ts @srikanthccv
86

97
# Onboarding
108
/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json @makeavish
119
/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx @makeavish
1210

13-
# Dashboard, Alert, Metrics, Service Map, Services
14-
/frontend/src/container/ListOfDashboard/ @srikanthccv
15-
/frontend/src/container/NewDashboard/ @srikanthccv
16-
/frontend/src/pages/DashboardsListPage/ @srikanthccv
17-
/frontend/src/pages/DashboardWidget/ @srikanthccv
18-
/frontend/src/pages/NewDashboard/ @srikanthccv
19-
/frontend/src/providers/Dashboard/ @srikanthccv
20-
21-
# Alerts
22-
/frontend/src/container/AlertHistory/ @srikanthccv
23-
/frontend/src/container/AllAlertChannels/ @srikanthccv
24-
/frontend/src/container/AnomalyAlertEvaluationView/ @srikanthccv
25-
/frontend/src/container/CreateAlertChannels/ @srikanthccv
26-
/frontend/src/container/CreateAlertRule/ @srikanthccv
27-
/frontend/src/container/EditAlertChannels/ @srikanthccv
28-
/frontend/src/container/FormAlertChannels/ @srikanthccv
29-
/frontend/src/container/FormAlertRules/ @srikanthccv
30-
/frontend/src/container/ListAlertRules/ @srikanthccv
31-
/frontend/src/container/TriggeredAlerts/ @srikanthccv
32-
/frontend/src/pages/AlertChannelCreate/ @srikanthccv
33-
/frontend/src/pages/AlertDetails/ @srikanthccv
34-
/frontend/src/pages/AlertHistory/ @srikanthccv
35-
/frontend/src/pages/AlertList/ @srikanthccv
36-
/frontend/src/pages/CreateAlert/ @srikanthccv
37-
/frontend/src/providers/Alert.tsx @srikanthccv
38-
39-
# Metrics
40-
/frontend/src/container/MetricsExplorer/ @srikanthccv
41-
/frontend/src/pages/MetricsApplication/ @srikanthccv
42-
/frontend/src/pages/MetricsExplorer/ @srikanthccv
43-
44-
# Services and Service Map
45-
/frontend/src/container/ServiceApplication/ @srikanthccv
46-
/frontend/src/container/ServiceTable/ @srikanthccv
47-
/frontend/src/pages/Services/ @srikanthccv
48-
/frontend/src/pages/ServiceTopLevelOperations/ @srikanthccv
49-
/frontend/src/container/Home/Services/ @srikanthccv
50-
5111
/deploy/ @SigNoz/devops
5212
.github @SigNoz/devops
5313

‎deploy/docker-swarm/docker-compose.ha.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ services:
176176
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
177177
signoz:
178178
!!merge <<: *db-depend
179-
image: signoz/signoz:v0.103.0
179+
image: signoz/signoz:v0.104.0
180180
command:
181181
- --config=/root/config/prometheus.yml
182182
ports:

‎deploy/docker-swarm/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ services:
117117
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
118118
signoz:
119119
!!merge <<: *db-depend
120-
image: signoz/signoz:v0.103.0
120+
image: signoz/signoz:v0.104.0
121121
command:
122122
- --config=/root/config/prometheus.yml
123123
ports:

‎deploy/docker/docker-compose.ha.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ services:
179179
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
180180
signoz:
181181
!!merge <<: *db-depend
182-
image: signoz/signoz:${VERSION:-v0.103.0}
182+
image: signoz/signoz:${VERSION:-v0.104.0}
183183
container_name: signoz
184184
command:
185185
- --config=/root/config/prometheus.yml

‎deploy/docker/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ services:
111111
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
112112
signoz:
113113
!!merge <<: *db-depend
114-
image: signoz/signoz:${VERSION:-v0.103.0}
114+
image: signoz/signoz:${VERSION:-v0.104.0}
115115
container_name: signoz
116116
command:
117117
- --config=/root/config/prometheus.yml

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/SigNoz/signoz/pkg/query-service/interfaces"
2020
basemodel "github.com/SigNoz/signoz/pkg/query-service/model"
2121
rules "github.com/SigNoz/signoz/pkg/query-service/rules"
22+
"github.com/SigNoz/signoz/pkg/queryparser"
2223
"github.com/SigNoz/signoz/pkg/signoz"
2324
"github.com/SigNoz/signoz/pkg/types"
2425
"github.com/SigNoz/signoz/pkg/types/authtypes"
@@ -60,6 +61,7 @@ func NewAPIHandler(opts APIHandlerOptions, signoz *signoz.SigNoz) (*APIHandler,
6061
FieldsAPI: fields.NewAPI(signoz.Instrumentation.ToProviderSettings(), signoz.TelemetryStore),
6162
Signoz: signoz,
6263
QuerierAPI: querierAPI.NewAPI(signoz.Instrumentation.ToProviderSettings(), signoz.Querier, signoz.Analytics),
64+
QueryParserAPI: queryparser.NewAPI(signoz.Instrumentation.ToProviderSettings(), signoz.QueryParser),
6365
})
6466

6567
if err != nil {

‎frontend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"@signozhq/button": "0.0.2",
4848
"@signozhq/calendar": "0.0.0",
4949
"@signozhq/callout": "0.0.2",
50+
"@signozhq/checkbox": "0.0.2",
5051
"@signozhq/design-tokens": "1.1.4",
5152
"@signozhq/input": "0.0.2",
5253
"@signozhq/popover": "0.0.0",

‎frontend/public/Logos/dashboards.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎frontend/public/Logos/envoy.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎frontend/public/Logos/fly-io.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)