Skip to content

Commit

Permalink
Merge pull request #144 from mfreeman451/updates/1.0.12_release
Browse files Browse the repository at this point in the history
Updates/1.0.12 release
  • Loading branch information
mfreeman451 authored Jan 30, 2025
2 parents 496199a + e4faeb0 commit ab1a0d3
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 34 deletions.
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,45 +30,45 @@ ServiceRadar can be installed via direct downloads from GitHub releases.
Install these components on your monitored host:
```bash
# Download and install core components
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-agent_1.0.11.deb \
-O https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-poller_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-agent_1.0.12.deb \
-O https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-poller_1.0.12.deb

sudo dpkg -i serviceradar-agent_1.0.11.deb serviceradar-poller_1.0.11.deb
sudo dpkg -i serviceradar-agent_1.0.12.deb serviceradar-poller_1.0.12.deb
```

On a separate machine (recommended) or the same host:
```bash
# Download and install cloud service
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-cloud_1.0.11.deb
sudo dpkg -i serviceradar-cloud_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-cloud_1.0.12.deb
sudo dpkg -i serviceradar-cloud_1.0.12.deb
```

#### Optional: Dusk Node Monitoring
If you're running a [Dusk](https://dusk.network/) node and want specialized monitoring:
```bash
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.11/serviceradar-dusk-checker_1.0.11.deb
sudo dpkg -i serviceradar-dusk-checker_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.12/serviceradar-dusk-checker_1.0.12.deb
sudo dpkg -i serviceradar-dusk-checker_1.0.12.deb
```

#### Distributed Setup
For larger deployments where components run on different hosts:

1. On monitored hosts:
```bash
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.11/serviceradar-agent_1.0.11.deb
sudo dpkg -i serviceradar-agent_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.12/serviceradar-agent_1.0.12.deb
sudo dpkg -i serviceradar-agent_1.0.12.deb
```

2. On monitoring host:
```bash
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-poller_1.0.11.deb
sudo dpkg -i serviceradar-poller_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-poller_1.0.12.deb
sudo dpkg -i serviceradar-poller_1.0.12.deb
```

3. On cloud host:
```bash
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-cloud_1.0.11.deb
sudo dpkg -i serviceradar-cloud_1.0.11.deb
curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.3/serviceradar-cloud_1.0.12.deb
sudo dpkg -i serviceradar-cloud_1.0.12.deb
```

## Architecture
Expand Down Expand Up @@ -170,19 +170,19 @@ cd serviceradar

1. **Agent Installation** (on monitored hosts):
```bash
sudo dpkg -i serviceradar-dusk-checker_1.0.11.deb # For Dusk nodes
sudo dpkg -i serviceradar-dusk-checker_1.0.12.deb # For Dusk nodes
# or
sudo dpkg -i serviceradar-agent_1.0.11.deb # For other hosts
sudo dpkg -i serviceradar-agent_1.0.12.deb # For other hosts
```

2. **Poller Installation** (on any host in your network):
```bash
sudo dpkg -i serviceradar-poller_1.0.11.deb
sudo dpkg -i serviceradar-poller_1.0.12.deb
```

3. **Cloud Installation** (on a reliable host):
```bash
sudo dpkg -i serviceradar-cloud_1.0.11.deb
sudo dpkg -i serviceradar-cloud_1.0.12.deb
```

## Configuration
Expand Down
2 changes: 1 addition & 1 deletion buildAll.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

VERSION=${VERSION:-1.0.11}
VERSION=${VERSION:-1.0.12}


./setup-deb-poller.sh
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func (s *Server) sendStartupNotification(ctx context.Context) error {
Timestamp: time.Now().UTC().Format(time.RFC3339),
NodeID: "cloud",
Details: map[string]any{
"version": "1.0.11",
"version": "1.0.12",
"hostname": getHostname(),
},
}
Expand Down
8 changes: 0 additions & 8 deletions pkg/sweeper/base_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ func (p *BaseProcessor) Process(result *models.Result) error {

switch result.Target.Mode {
case models.ModeICMP:
// Log before ICMP processing
log.Printf("Processing ICMP result for %s (available: %v, response time: %v)",
result.Target.Host, result.Available, result.RespTime)

p.processICMPResult(host, result)

case models.ModeTCP:
Expand Down Expand Up @@ -189,10 +185,6 @@ func (*BaseProcessor) processICMPResult(host *models.HostResult, result *models.
if result.RespTime > 0 {
host.ResponseTime = result.RespTime
}

// Log after processing
log.Printf("Updated ICMP status for %s: available=%v, roundtrip=%v",
host.Host, host.ICMPStatus.Available, host.ICMPStatus.RoundTrip)
}

func (p *BaseProcessor) GetSummary(ctx context.Context) (*models.SweepSummary, error) {
Expand Down
4 changes: 3 additions & 1 deletion setup-deb-agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# setup-deb-agent.sh
set -e # Exit on any error

VERSION=${VERSION:-1.0.11}
VERSION=${VERSION:-1.0.12}
echo "Building serviceradar-agent version ${VERSION}"

echo "Setting up package structure..."
Expand Down Expand Up @@ -51,6 +51,8 @@ User=serviceradar
ExecStart=/usr/local/bin/serviceradar-agent
Restart=always
RestartSec=10
LimitNPROC=512
LimitNOFILE=65535
[Install]
WantedBy=multi-user.target
Expand Down
2 changes: 1 addition & 1 deletion setup-deb-cloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e # Exit on any error

echo "Setting up package structure..."

VERSION=${VERSION:-1.0.11}
VERSION=${VERSION:-1.0.12}

# Create package directory structure
PKG_ROOT="serviceradar-cloud_${VERSION}"
Expand Down
4 changes: 3 additions & 1 deletion setup-deb-dusk-checker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e # Exit on any error

echo "Setting up package structure..."

VERSION=${VERSION:-1.0.11}
VERSION=${VERSION:-1.0.12}

# Create package directory structure
PKG_ROOT="serviceradar-dusk-checker_${VERSION}"
Expand Down Expand Up @@ -52,6 +52,8 @@ User=serviceradar
ExecStart=/usr/local/bin/dusk-checker -config /etc/serviceradar/checkers/dusk.json
Restart=always
RestartSec=10
LimitNPROC=512
LimitNOFILE=65535
[Install]
WantedBy=multi-user.target
Expand Down
4 changes: 3 additions & 1 deletion setup-deb-poller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e # Exit on any error

echo "Setting up package structure..."

VERSION=${VERSION:-1.0.11}
VERSION=${VERSION:-1.0.12}

# Create package directory structure
PKG_ROOT="serviceradar-poller_${VERSION}"
Expand Down Expand Up @@ -52,6 +52,8 @@ User=serviceradar
ExecStart=/usr/local/bin/serviceradar-poller -config /etc/serviceradar/poller.json
Restart=always
RestartSec=10
LimitNPROC=512
LimitNOFILE=65535
[Install]
WantedBy=multi-user.target
Expand Down
4 changes: 2 additions & 2 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "serviceradar-web",
"version": "1.0.11",
"version": "1.0.12",
"private": true,
"type": "module",
"dependencies": {
Expand Down

0 comments on commit ab1a0d3

Please sign in to comment.