Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion agent-manager/agent/agent.pb.go

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

24 changes: 12 additions & 12 deletions agent-manager/agent/agent_grpc.pb.go

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

18 changes: 11 additions & 7 deletions agent-manager/agent/collector.pb.go

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

12 changes: 6 additions & 6 deletions agent-manager/agent/collector_grpc.pb.go

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

2 changes: 1 addition & 1 deletion agent-manager/agent/common.pb.go

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

2 changes: 1 addition & 1 deletion agent-manager/agent/ping.pb.go

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

6 changes: 3 additions & 3 deletions agent-manager/agent/ping_grpc.pb.go

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

5 changes: 3 additions & 2 deletions agent-manager/models/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import "gorm.io/gorm"
type CollectorModule string

const (
AS_400 CollectorModule = "AS_400"
UTMSTACK CollectorModule = "UTMSTACK"
AS_400 CollectorModule = "AS_400"
UTMSTACK CollectorModule = "UTMSTACK"
FORWARDER CollectorModule = "FORWARDER"
)

type Collector struct {
Expand Down
1 change: 1 addition & 0 deletions agent-manager/protos/collector.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ service CollectorService {
enum CollectorModule{
AS_400 = 0;
UTMSTACK = 1;
FORWARDER = 2;
}

message RegisterRequest {
Expand Down
8 changes: 8 additions & 0 deletions collectors/forwarder/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/utmstack/UTMStack/collectors/forwarder/config"
"github.com/utmstack/UTMStack/collectors/forwarder/serv"
"github.com/utmstack/UTMStack/collectors/forwarder/updates"
"github.com/utmstack/UTMStack/collectors/forwarder/upstream"
"github.com/utmstack/UTMStack/collectors/forwarder/utils"
)
Expand All @@ -33,6 +34,13 @@ var installCmd = &cobra.Command{
}
fmt.Println("[OK]")

fmt.Print("Downloading version info ... ")
if err := updates.DownloadVersion(cnf.Server, cnf.SkipCertValidation); err != nil {
fmt.Println("\nError downloading version info: ", err)
os.Exit(1)
}
fmt.Println("[OK]")

fmt.Print("Configuring collector ... ")
if err := upstream.RegisterCollector(cnf, utmKey); err != nil {
fmt.Println("\nError registering collector: ", err)
Expand Down
7 changes: 5 additions & 2 deletions collectors/forwarder/config/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ import (
var REPLACE_KEY string

var (
AgentManagerPort = "9000"
LogAuthProxyPort = "50051"
AgentManagerPort = "9000"
LogAuthProxyPort = "50051"
DependenciesPort = "9001"
DependUrl = "https://%s:%s/private/dependencies/collector/%s"
VersionPath = filepath.Join(fs.GetExecutablePath(), "version.json")

CollectorLogFile = filepath.Join(fs.GetExecutablePath(), "logs", "utmstack_forwarder.log")
UUIDFileName = filepath.Join(fs.GetExecutablePath(), "collector-uuid.yml")
Expand Down
6 changes: 6 additions & 0 deletions collectors/forwarder/listeners/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
stdhttp "net/http"
"os"
"path/filepath"
"strings"
)

Expand Down Expand Up @@ -88,6 +89,11 @@ func GenerateTokenFile(path string) (string, error) {
return "", fmt.Errorf("generate token: %w", err)
}
token := hex.EncodeToString(b)
if dir := filepath.Dir(path); dir != "" {
if err := os.MkdirAll(dir, 0700); err != nil {
return "", fmt.Errorf("write token file: create dir: %w", err)
}
}
if err := os.WriteFile(path, []byte(token+"\n"), 0600); err != nil {
return "", fmt.Errorf("write token file: %w", err)
}
Expand Down
17 changes: 17 additions & 0 deletions collectors/forwarder/updates/dependencies.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package updates

import (
"fmt"

"github.com/utmstack/UTMStack/collectors/forwarder/config"
sharedhttp "github.com/utmstack/UTMStack/shared/http"
"github.com/utmstack/UTMStack/shared/fs"
)

func DownloadVersion(address string, insecure bool) error {
url := fmt.Sprintf(config.DependUrl, address, config.DependenciesPort, "version.json")
if err := sharedhttp.DownloadFile(url, map[string]string{}, "version.json", fs.GetExecutablePath(), insecure); err != nil {
return fmt.Errorf("error downloading version.json: %v", err)
}
return nil
}
Loading
Loading