Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Re-Implement Monitors #64

Draft
wants to merge 12 commits into
base: develop
Choose a base branch
from
+290 −1,555
Draft

[WIP] Re-Implement Monitors #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ab4dd9
reimplement dmsg-monitor with new logic
mrpalide Mar 26, 2024
ddca1e5
create internal monitors for all monitor services, as config reader a…
mrpalide Mar 26, 2024
ee33025
reimplement ar and merge to dmsg as one monitor service
mrpalide Mar 26, 2024
c670027
combine ar and dmsg monitor as network-monitor
mrpalide Mar 26, 2024
bccb0ae
fix docker configs for new combined network monitor
mrpalide Mar 26, 2024
622a466
fix removed dmsg monitor from skywire-services cmd
mrpalide Mar 26, 2024
ea94699
fix issue on ut url
mrpalide Mar 26, 2024
4eb401b
remove useless dmsgmonitor commands
mrpalide Mar 26, 2024
a3757f2
fix network-monitor.json config for e2e and integration test
mrpalide Mar 26, 2024
c4e140f
remove useless nm-redis from docker-compose config
mrpalide Mar 26, 2024
5cd587a
remove dmsg-monitor from env_test cases
mrpalide Mar 26, 2024
0de62c8
fix removed dmsg-monitor codes
mrpalide Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export REGISTRY=${DOCKER_REGISTRY}
dep: ## Sorts dependencies
# GO111MODULE=on GOPRIVATE=github.com/skycoin/* go get -v github.com/skycoin/skywire@master
GO111MODULE=on GOPRIVATE=github.com/skycoin/* go mod vendor -v
yarn --cwd ./pkg/node-visualizer/web install
# yarn --cwd ./pkg/node-visualizer/web install

format: dep ## Formats the code. Must have goimports and goimports-reviser installed (use make install-linters).
goimports -w -local github.com/skycoin/skywire-services ./pkg
Expand All @@ -69,7 +69,6 @@ build: dep ## Build binaries
${OPTS} go build ${BUILD_OPTS} -o ./bin/transport-setup ./cmd/transport-setup
${OPTS} go build ${BUILD_OPTS} -o ./bin/config-bootstrapper ./cmd/config-bootstrapper
${OPTS} go build ${BUILD_OPTS} -o ./bin/liveness-checker ./cmd/liveness-checker
${OPTS} go build ${BUILD_OPTS} -o ./bin/dmsg-monitor ./cmd/dmsg-monitor
${OPTS} go build ${BUILD_OPTS} -o ./bin/tpd-monitor ./cmd/tpd-monitor
${OPTS} go build ${BUILD_OPTS} -o ./bin/vpn-monitor ./cmd/vpn-monitor
${OPTS} go build ${BUILD_OPTS} -o ./bin/skysocks-monitor ./cmd/skysocks-monitor
Expand All @@ -90,7 +89,6 @@ build-deploy: ## Build for deployment Docker images
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/vpn-client ./cmd/vpn-lite-client
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/transport-setup ./cmd/transport-setup
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/node-visualizer ./cmd/node-visualizer
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/dmsg-monitor ./cmd/dmsg-monitor
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/tpd-monitor ./cmd/tpd-monitor
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/vpn-monitor ./cmd/vpn-monitor
${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/skysocks-monitor ./cmd/skysocks-monitor
Expand All @@ -109,7 +107,6 @@ build-race: dep ## Build binaries
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/vpn-client ./cmd/vpn-lite-client
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/transport-setup ./cmd/transport-setup
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/node-visualizer ./cmd/node-visualizer
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/dmsg-monitor ./cmd/dmsg-monitor
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/tpd-monitor ./cmd/tpd-monitor
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/vpn-monitor ./cmd/vpn-monitor
${OPTS} go build ${BUILD_OPTS} -race -o ./bin/skysocks-monitor ./cmd/skysocks-monitor
Expand Down
16 changes: 0 additions & 16 deletions cmd/dmsg-monitor/README.md
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions cmd/dmsg-monitor/commands/root.go
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions cmd/dmsg-monitor/dmsg-monitor.go
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions cmd/network-monitor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Network Monitor
# DMSG Monitor

## API endpoints

Expand All @@ -14,6 +14,3 @@ Gets the health info of the service. e.g.
"started_at": "2022-10-25T11:10:45.152629597Z"
}
```

### GET `/status`
Gets the status of all the transports in the deployment.
Loading
Loading