Nageshbansal
101b3668b5
chore(statsreporter): fix azure IMDS endpoint in statsreporter ( #9243 )
2025-10-03 17:00:06 +00:00
Srikanth Chekuri
1b1aa4915b
chore: link to docs, QB flavour for expr and update options ( #9246 )
2025-10-03 21:50:56 +05:30
aniketio-ctrl
f9a70a3a69
chore: notification routing | added notificaiton routing via expression based routes ( #9195 )
...
* chore: added custom distpatcher
* feat(notification-grouping): added notification grouping
* feat(notification-grouping): addded integration test dependency
* feat(notification-grouping): linting and test cases
* feat(notification-grouping): linting and test cases
* feat(notification-grouping): linting and test cases
* feat(notification-grouping): addded integration test dependency
* feat(notification-grouping): debug log lines
* feat(notification-grouping): debug log lines
* feat(notification-grouping): debug log lines
* feat(notification-grouping): addded integration test dependency
* feat(notification-grouping): addded integration test dependency
* feat(notification-grouping): addded integration test dependency
* feat(notification-grouping): added structure changes
* feat(notification-grouping): added structure changes
* feat(notification-routing): added notification routing
* chore(notification-grouping): added notificaiton grouping
* Update pkg/alertmanager/nfmanager/rulebasednotification/provider.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore(notification-grouping): added renotification interval
* fix(notification-grouping): added fix for renotification
* chore(notificaiton-grouping): added no data renotify
* chore(notificaiton-grouping): added no data renotify
* chore(notificaiton-grouping): added no data renotify
* chore(notification-grouping): added no data renotify interval
* chore(notification-grouping): removed errors package from dispatcher
* chore(notification-grouping): removed errors package from dispatcher
* chore(notification-grouping): removed unwanted tests
* chore(notification-grouping): removed unwanted pkg name
* chore(notification-grouping): added delete notification setting
* chore(notification-grouping): added delete notification setting
* Update pkg/alertmanager/nfmanager/nfmanagertest/provider.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore(notification-grouping): removed nfmanager config| notification settings in postable rule
* chore(notification-grouping): removed nfmanager config| notification settings in postable rule
* chore(notification-grouping): added test for dispatcher
* chore(notification-grouping): added test for dispatcher
* chore(notification-grouping): go linting errors
* chore(notification-grouping): added test cases for aggGroupPerRoute
* chore(notification-grouping): added test cases for aggGroupPerRoute
* chore(notification-grouping): corrected get notification config logic
* Update pkg/alertmanager/nfmanager/rulebasednotification/provider_test.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore(notification-routing): added notification routing policies
* feat(notification-routing): added test cases for dispatcher
* chore(notification-routing): added notification routing policies
* chore(notification-routing): added notification routing policies
* Apply suggestions from code review
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore(notification-routing): added notification routing policies
* chore(notification-routing): added notification routing policies
* Update pkg/alertmanager/alertmanagerserver/distpatcher_test.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore(notification-routing): sorted imports
* chore(notification-routing): minor edit |pr resolve comments
* chore(notification-grouping): corrected dispatcher test cases
* chore(notification-routing): added notification routing policies
* chore(notification-routing): corrected race condition in test
* chore: resolved pr comments
* chore: passing threshold value to tempalte
* chore: completed delete rule functionality
* chore: added grouping disabled functionality
* chore: added grouping disabled functionality
* chore(notification-routing): resolved pr comments
* chore(notification-routing): resolved pr comments
* chore(notification-routing): resolved pr comments
* chore(notification-routing): sorted imports
* chore(notification-routing): fix linting errors
* chore(notification-routing): removed enabled flags
* fix: test rule multiple threhsold (#9224 )
* chore: corrected linting errors
* chore: corrected linting errors
* chore: corrected linting errors
* chore: corrected linting errors
* chore: corrected migration errors
* chore: corrected migration errors
* chore: corrected migration errors
* chore: corrected migration errors
* Update pkg/sqlmigration/049_add_route_policy.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* chore: added org_is as foreign key
* chore: resolved pr comments
* chore: removed route store unused
---------
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
2025-10-03 19:47:15 +05:30
Nityananda Gohain
d3be2632b6
fix: exists/not exists for resource attributes ( #9129 )
...
* fix: exists/not exists for resource attributes
* fix: update tests
* fix: remove unwanted changes
---------
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
2025-10-03 05:42:42 +00:00
Srikanth Chekuri
78e4f4f386
fix: handle resource/attribute context collision with expression using paranthesis ( #9240 )
2025-10-03 10:16:06 +05:30
Nageshbansal
9ffe0d8143
chore(statsreporter): add nomad, vultr, aca platform detection ( #9220 )
2025-09-30 16:31:43 +05:30
Vikrant Gupta
1b818dd05d
feat(authz): build role module ( #9136 )
...
* feat(authz): build role module
* feat(authz): build role module
* feat(authz): refactor the role module to move transactions out
* feat(authz): add handler implementation except patch objects
* feat(authz): added the missing handler
* feat(authz): added changes for selectors
* feat(authz): added changes for selectors
* feat(authz): added changes for selectors
* feat(authz): make the role create handler just to create metadata
* feat(authz): address review comments
* feat(authz): address review comments
* feat(authz): address review comments
* feat(authz): address review comments
2025-09-29 17:45:52 +05:30
aniketio-ctrl
735b90722d
chore(notification grouping): added custom grouping in signoz dispatcher ( #8812 )
2025-09-26 13:24:58 +00:00
Ekansh Gupta
7ddaa84387
feat: add materialise ttl = 0 in set ttl v2 ( #9189 )
2025-09-26 05:44:13 +00:00
Niladri Adhikary
6d5f0adab9
fix: prevent panels with all queries disabled ( #9093 )
...
Signed-off-by: “niladrix719” <niladrix719@gmail.com>
2025-09-26 01:08:35 +00:00
Vikrant Gupta
0b4831ca04
chore(authz): bump up openfga version ( #9175 )
...
* chore(authz): bump up openfga version
* chore(authz): bump up openfga version
* chore(authz): bump up openfga version
---------
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
2025-09-25 13:07:48 +05:30
Ekansh Gupta
80f0c6dd92
feat: added cold storage in set ttl v2 method ( #9151 )
...
* feat: added cold storage in set ttl v2 method
* feat: standardised cold storage ttl to days
* feat: added coldstorage ttl in response structure of get api
2025-09-25 06:57:20 +00:00
Vikrant Gupta
c68096152d
chore(clickhouse): bump ch-go ( #9169 )
...
* fix(integration): fix tests
* fix(integration): fix tests
* chore(clickhouse): bump ch-go
---------
Co-authored-by: Nityananda Gohain <nityanandagohain@gmail.com>
2025-09-24 15:10:29 +05:30
Ekansh Gupta
eb38dd548a
3rd party sem conv fix ( #8980 )
...
* feat: adding support for 1.26 semconv
* feat: adding support for 1.26 semconv
* feat: adding support for 1.26 semconv
* feat: adding support for 1.26 semconv
* feat: added native support for 1.26
* feat: added native support for 1.26
* feat: adding support for 1.26 semconv
* feat: adding support for 1.26 semconv
* feat: adding support for 1.26 semconv
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: fixed merge conflicts
* feat: fixed merge conflicts
* feat: added intermediate methods to fix response structure
* feat: fixed the errors on errors.newf
2025-09-23 10:55:59 +00:00
Nityananda Gohain
a564fa9d28
fix: dont accept materialized key from payload ( #9139 )
...
* fix: dont accept materialized key from payload
* fix: use correct omit operator
2025-09-22 05:11:57 +00:00
aniketio-ctrl
7f4390f370
fix: Edit and patch rule functionality ( #9125 )
...
* fix: fixed edit and patch rule functionality
* fix: fixed edit and patch rule functionality
* fix: fixed edit and patch rule functionality
* fix: added patch rule test and rule mock store
* fix: removed schema version field
* fix: removed schema version field
* fix: added test cases for patch, create, edit
* fix: removed schema version field
2025-09-21 17:48:31 +05:30
Vikrant Gupta
0c25de9560
feat(authz): build authz service ( #9064 )
...
* feat(authz): define the domain layer
* feat(authz): added openfga schema and split the enterprise code
* feat(authz): revert http handler
* feat(authz): address comments
* feat(authz): address comments
* feat(authz): typo comments
* feat(authz): address review comments
* feat(authz): address review comments
* feat(authz): update the oss model
* feat(authz): update the sequential check
2025-09-17 21:35:11 +05:30
Piyush Singariya
0626a89412
Revert "fix: upgrading clickhouse-go ( #8969 )" ( #9113 )
...
This reverts commit 5cd775f2b286a941bd3d0b9c8349c9d9cf9aadf1.
2025-09-17 16:31:02 +05:30
Piyush Singariya
5cd775f2b2
fix: upgrading clickhouse-go ( #8969 )
...
* test: upgrading clickhouse-go
* fix: go mod tidy
* fix: upgrade semconv
---------
Co-authored-by: Nityananda Gohain <nityanandagohain@gmail.com>
Co-authored-by: Vikrant Gupta <vikrant@signoz.io>
2025-09-17 14:11:18 +05:30
Srikanth Chekuri
1c257f3e14
chore: populate default zero queries for metrics ( #9103 )
2025-09-17 07:05:38 +00:00
Srikanth Chekuri
cc77b829af
chore: recognize dashboard view page for log_comment ( #9084 )
2025-09-16 19:43:54 +00:00
Nityananda Gohain
49306cbe3d
fix: add trace perf improvement only when there is any filter ( #9099 )
2025-09-16 17:08:58 +00:00
Srikanth Chekuri
233a8e4cc3
chore: use wss usage for workloads listing ( #9104 )
2025-09-16 16:42:15 +00:00
Srikanth Chekuri
629378bbec
chore: do not fail on non-existent signoz_ dbs ( #9092 )
2025-09-16 16:15:11 +00:00
Niladri Adhikary
c5051128fa
feat: warn when LIKE/ILIKE is used without any %/_ ( #9098 )
...
* feat: warn when LIKE/ILIKE is used without any %/_
Signed-off-by: “niladrix719” <niladrix719@gmail.com>
2025-09-16 06:23:26 +00:00
aniketio-ctrl
ac81eab7bb
chore: added cumulative window support ( #8828 )
...
* feat(multi-threshold): added multi threshold
* Update pkg/types/ruletypes/api_params.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* feat(multiple-threshold): added multiple thresholds
* Update pkg/types/ruletypes/alerting.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* feat(multiple-threshold): added multiple thresholds
* feat(cumulative-window): added cumulative window
* feat(multi-threshold): added recovery min points
* Update pkg/query-service/rules/threshold_rule.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* feat(multi-threshold): fixed log lines
* feat(multi-threshold): added severity as threshold name
* feat(cumulative-window): added cumulative window for alerts v2
* feat(multi-threshold): removed break to send multi threshold alerts
* feat(multi-threshold): removed break to send multi threshold alerts
* feat(cumulative-window): segregated json marshalling with evaluation logic
* feat(multi-threshold): corrected the test cases
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(multi-threshold): added segregation on json marshalling and actual threhsold logic
* feat(multi-threshold): added segregation on json marshalling and actual threhsold logic
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(multi-threshold): added segregation on json marshalling and actual threhsold logic
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(multi-threhsold): added error wrapper
* feat(multi-threhsold): added error wrapper
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(multi-threhsold): added error wrapper
* Update pkg/types/ruletypes/threshold.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* feat(cumulative-window): segregated json marshalling and evaluation logic
* feat(multi-threshold): added validation and error propagation
* feat(multi-notification): removed pre defined labels from links of log and traces
* feat(multi-notification): removed pre defined labels from links of log and traces
* feat(multi-threshold): added json parser for gettable rule
* feat(multi-threshold): added json parser for gettable rule
* feat(multi-threshold): added json parser for gettable rule
* feat(multi-threshold): added umnarshaller for postable rule
* feat(multi-threshold): added umnarshaller for postable rule
* feat(cumulative-window): added validation check
* Update pkg/types/ruletypes/evaluation.go
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* feat(multi-threhsold): removed yaml support for alerts
* Update pkg/types/ruletypes/evaluation.go
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
* Update pkg/types/ruletypes/evaluation.go
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
* chore(cumulative-window): renamed funcitons
* chore(cumulative-window): removed naked errors
* chore(cumulative-window): added reset boundary condition tests
* chore(cumulative-window): added reset boundary condition tests
* chore(cumulative-window): sorted imports
* chore(cumulative-window): sorted imports
* chore(cumulative-window): sorted imports
* chore(cumulative-window): removed error from next window for
* chore(cumulative-window): removed error from next window for
* chore(cumulative-window): added case for timezone
* chore(cumulative-window): added validation for eval window
* chore(cumulative-window): updated api structure for cumulative window
* chore(cumulative-window): updated schedule enum
---------
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
2025-09-15 15:00:12 +05:30
Srikanth Chekuri
c982b1e76d
chore: allow number segment, #, @, {} in key ( #9082 )
2025-09-14 22:14:42 +05:30
Srikanth Chekuri
252786deb6
chore: make qb v5 default ( #9085 )
2025-09-14 20:41:13 +05:30
Nityananda Gohain
38ca467d13
fix: trace perf - scan only required traces ( #9072 )
2025-09-14 13:12:48 +00:00
Nityananda Gohain
a686941880
fix: exception on resource filters with numeric values ( #9028 )
2025-09-14 13:00:16 +00:00
Nityananda Gohain
ae58915020
chore: support for json column in resources ( #8376 )
2025-09-14 18:18:39 +05:30
aniketio-ctrl
d801fcee76
chore: add multiple thresholds support ( #8816 )
2025-09-12 13:11:54 +05:30
Vibhu Pandey
61acd946cc
fix: enable dot metrics by default ( #9061 )
2025-09-11 17:59:55 +00:00
Vibhu Pandey
31e042adf7
feat(alertmanager): deprecate legacy alertmanager ( #9046 )
...
- Deprecate legacy alertmanager. Are the new alert improvements compatible with legacy? I don't think they are. More importantly, I don't think they should be. It will be a pain to manage it at both places.
- Improve msteamsv2 experience. I have taken alertmanager's upstream and merged it with our custom implementation. Note the use of `titleLink` field to propagate the url of the alert.
- Delete the private http server needed for alertmanager. It's cleanup as part of 1.
2025-09-10 08:28:13 +00:00
Tushar Vats
6c7275d355
Feat: API for exporting raw data ( #8936 )
...
This introduces a new Raw Data Export module to the codebase, enabling users to export raw log data via a dedicated API endpoint. The changes include the implementation of the module and handler, integration with existing infrastructure, configuration updates, and adjustments to tests and module wiring.
2025-09-09 17:04:40 +05:30
Vibhu Pandey
c83eaf3d50
chore: enable forbidigo and noerrors in depguard ( #9047 )
...
* chore: enable forbidgo
* chore: enable forbidgo
2025-09-09 15:44:27 +05:30
Vikrant Gupta
6709b09646
fix(user): populate correct error message on client ( #9043 )
...
* fix(user): populate correct error message on client
* fix(user): populate correct error message on client
2025-09-09 13:05:07 +05:30
aniketio-ctrl
c737a7e070
chore: enable alertmanager metrics collection with instrumentation::metrics ( #9020 )
...
* feat(alerts-v2): exposed alertmanager metrics for signozalertmanager
* feat(alerts-v2): exposed alertmanager metrics for signozalertmanager
* feat(alerts-v2): exposed alertmanager metrics for signozalertmanager
* feat(notification-routing): added custom meter provider
* feat(notification-routing): added custom meter provider
* feat(notification-routing): added custom meter provider
* feat(notification-routing): added custom meter provider
* feat(notification-routing): added org id label
2025-09-08 14:41:18 +05:30
Srikanth Chekuri
1d3a8ecd66
fix(variable_replace_visitor): do not skip boolean value ( #9021 )
2025-09-07 08:40:11 +00:00
Vibhu Pandey
f63f175a77
fix(binding): better error messages ( #9010 )
2025-09-05 15:47:19 +00:00
Ekansh Gupta
b6f5c053a0
feat: trace operators BE ( #8293 )
...
* feat: [draft] added implementation of trace operators
* feat: [draft] added implementation of trace operators
* feat: [draft] added implementation of trace operators
* feat: [draft] added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: added implementation of trace operators
* feat: refactor trace operator
* feat: added postprocess
* feat: added postprocess
* feat: added postprocess
* feat: refactored the consume function
* feat: refactored the consume function
* feat: refactored the consume function
* feat: refactored the consume function
* feat: refactored the consume function
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: replaced info to debug logs
* feat: replaced info to debug logs
* feat: replaced info to debug logs
* feat: updated time series query
* feat: fixed merge conflicts
* feat: fixed merge conflicts
* feat: fixed merge conflicts
* feat: fixed merge conflicts
* feat: added deep copy in ranged queries
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: refactored fingerprinting
* feat: added comment for build all spans cte
* feat: added postprocess for timeseries and added limits to memory
* feat: fixed span count in trace view
* feat: fixed span count in trace view
* feat: fixed linting issues
* feat: fixed linting issues
* feat: fixed linting issues
* feat: fixed linting issues
---------
Co-authored-by: Nityananda Gohain <nityanandagohain@gmail.com>
2025-09-05 21:07:10 +05:30
Vibhu Pandey
360e8309c8
feat(password): implement strong controls for password ( #8983 )
...
## 📄 Summary
implement strong controls for password. Now the password requirement is :
password must be at least 12 characters long, should contain at least one uppercase letter [A-Z], one lowercase letter [a-z], one number [0-9], and one symbol
2025-09-04 17:22:28 +05:30
Vikrant Gupta
2dbe0777f4
feat(authz): add openfga authz middleware ( #8990 )
...
* feat(authz): add openfga authz middleware
* feat(authz): update the auth context
* feat(authz): update the auth context
* feat(authz): update check request
* feat(authz): update check request
* feat(authz): add lifecycle tests
* feat(authz): add lifecycle tests
* feat(authz): add start-stop tests
2025-09-04 08:37:11 +00:00
Shaheer Kochai
3999a64c64
feat: add pinning functionality for span attributes ( #8769 )
...
* refactor: adjust the attribute pinning changes based on trace actionables latest changes
* feat: persist pinned attributes on the BE, fallback to local storage
* chore: overall improvement
* chore: fix the failing tests
* fix: make the changes w.r.t. pinned attributes preferences in in preference.go
2025-09-03 16:36:10 +04:30
Vikrant Gupta
729bfb31f1
feat(authz): implement the current usecases in openfga ( #8982 )
...
* feat(authz): implement the current usecases in openfga
* feat(authz): implement the current usecases in openfga
* feat(authz): extract out the schema and DI the same
* feat(authz): extract out the schema and DI the same
2025-09-02 11:00:47 +00:00
Nityananda Gohain
052fb8b703
fix: support canDefaultZero for logs and traces ( #8973 )
...
* fix: support canDefaultZero for logs and traces
* fix: remove increase
* fix: move changes to req.go
* fix: add tood
* fix: address comments
2025-09-02 09:54:55 +00:00
nikhilmantri0902
5d9247f591
Allow deletion of multiple panels for dashboard updates made with API key ( #8903 )
2025-09-02 09:30:22 +00:00
Vikrant Gupta
0df1ed3b57
fix(dashboard): remove context from dashboard types ( #8971 )
2025-09-01 16:08:25 +00:00
Vikrant Gupta
f61e859901
feat(authz): embed openfga server ( #8966 )
...
* feat(access-control): embed openfga in signoz
* feat(authz): rename access control to authz
* feat(authz): fix codeowners and go mod tidy
* feat(authz): fix lint
* feat(authz): update go version and move convertor to instrumentation
* feat(authz): some more lint issues
* feat(authz): some more lint issues
* feat(authz): some more lint issues
* feat(authz): fix more lint issues
* feat(authz): make logger converter interface
2025-09-01 17:10:13 +05:30
Ekansh Gupta
4daec45d98
feat: added custom retention for logs api ( #8513 )
...
* feat: added custom retention for logs api
* feat: added custom retention for logs api
* feat: added implementation of trace operators
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added validation checks for resource keys
* feat: added default checks for custom retention
* feat: added default checks for custom retention
* feat: added default checks for custom retention
* feat: added change for ttl
* feat: v2 api supports both v1 and v2
* feat: v2 api supports both v1 and v2
* feat: v2 api supports both v1 and v2
* feat: v2 api supports both v1 and v2
* feat: added default_ttl in v1
* feat: added set logs ttl v1 from v2
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
* feat: resolved conflicts
2025-09-01 07:30:57 +00:00
