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

Jump to bottom

refactor(all): Remove support-logging and LoggingInfo config #2919

Merged
merged 3 commits into from
Dec 3, 2020
Merged

refactor(all): Remove support-logging and LoggingInfo config #2919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3ba6d
refactor(all): Remove support-logging and LoggingInfo config
Dec 3, 2020
1cf06a7
fix: Fix failing unit test due to removal of proxy for logging services
Dec 3, 2020
fc0a0c9
fix: Restrored core-command in build targets
Dec 3, 2020
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
42 changes: 21 additions & 21 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,30 @@
GO=CGO_ENABLED=0 GO111MODULE=on go
GOCGO=CGO_ENABLED=1 GO111MODULE=on go

DOCKERS=docker_core_data docker_core_metadata docker_core_command docker_support_logging \
docker_support_notifications docker_sys_mgmt_agent docker_support_scheduler \
docker_security_secrets_setup docker_security_proxy_setup docker_security_secretstore_setup \
DOCKERS= \
docker_core_data \
docker_core_metadata \
docker_core_command \
docker_support_notifications \
docker_sys_mgmt_agent \
docker_support_scheduler \
docker_security_secrets_setup \
docker_security_proxy_setup \
docker_security_secretstore_setup \
docker_security_bootstrap_redis

.PHONY: $(DOCKERS)

MICROSERVICES=cmd/core-metadata/core-metadata cmd/core-data/core-data \
cmd/core-command/core-command cmd/support-logging/support-logging \
cmd/support-notifications/support-notifications cmd/sys-mgmt-executor/sys-mgmt-executor \
cmd/sys-mgmt-agent/sys-mgmt-agent cmd/support-scheduler/support-scheduler \
cmd/security-secrets-setup/security-secrets-setup cmd/security-proxy-setup/security-proxy-setup \
MICROSERVICES= \
cmd/core-data/core-data \
cmd/core-metadata/core-metadata \
cmd/core-command/core-command \
cmd/support-notifications/support-notifications \
cmd/sys-mgmt-executor/sys-mgmt-executor \
cmd/sys-mgmt-agent/sys-mgmt-agent \
cmd/support-scheduler/support-scheduler \
cmd/security-secrets-setup/security-secrets-setup \
cmd/security-proxy-setup/security-proxy-setup \
cmd/security-secretstore-setup/security-secretstore-setup \
cmd/security-file-token-provider/security-file-token-provider \
cmd/security-bootstrap-redis/security-bootstrap-redis \
Expand Down Expand Up @@ -49,9 +62,6 @@ cmd/core-data/core-data:
cmd/core-command/core-command:
$(GO) build $(GOFLAGS) -o $@ ./cmd/core-command

cmd/support-logging/support-logging:
$(GO) build $(GOFLAGS) -o $@ ./cmd/support-logging

cmd/support-notifications/support-notifications:
$(GO) build $(GOFLAGS) -o $@ ./cmd/support-notifications

Expand Down Expand Up @@ -131,16 +141,6 @@ docker_core_command:
-t edgexfoundry/docker-core-command-go:$(DOCKER_TAG) \
.

docker_support_logging:
docker build \
--build-arg http_proxy \
--build-arg https_proxy \
-f cmd/support-logging/Dockerfile \
--label "git_sha=$(GIT_SHA)" \
-t edgexfoundry/docker-support-logging-go:$(GIT_SHA) \
-t edgexfoundry/docker-support-logging-go:$(DOCKER_TAG) \
.

docker_support_notifications:
docker build \
--build-arg http_proxy \
Expand Down
10 changes: 0 additions & 10 deletions cmd/core-command/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,12 @@ Host = 'localhost'
Port = 8500
Type = 'consul'

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ''

[Clients]
[Clients.Metadata]
Protocol = 'http'
Host = 'localhost'
Port = 48081

[Clients.Logging]
Protocol = 'http'
Host = 'localhost'
Port = 48061

[Databases]
[Databases.Primary]
Host = 'localhost'
Expand Down
10 changes: 0 additions & 10 deletions cmd/core-data/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,12 @@ Host = 'localhost'
Port = 8500
Type = 'consul'

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ''

[Clients]
[Clients.Metadata]
Protocol = 'http'
Host = 'localhost'
Port = 48081

[Clients.Logging]
Protocol = 'http'
Host = 'localhost'
Port = 48061

[Databases]
[Databases.Primary]
Host = 'localhost'
Expand Down
8 changes: 0 additions & 8 deletions cmd/core-metadata/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,8 @@ Host = 'localhost'
Port = 8500
Type = 'consul'

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ''

[Clients]
[Clients.Logging]
Protocol = 'http'
Host = 'localhost'
Port = 48061
[Clients.Notifications]
Protocol = 'http'
Host = 'localhost'
Expand Down
4 changes: 0 additions & 4 deletions cmd/security-bootstrap-redis/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
[Writable]
LogLevel = 'INFO'

[Logging]
EnableRemote = false
File = ''

[SecretStore]
Host = 'localhost' ## Override in environment variables, if necessary
ServerName = 'edgex-vault' ## Needed for TLS CN
Expand Down
10 changes: 0 additions & 10 deletions cmd/security-proxy-setup/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
LogLevel = "ERROR"
RequestTimeout = 10

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ""

[KongURL]
Server = "127.0.0.1"
AdminPort = 8001
Expand Down Expand Up @@ -71,11 +66,6 @@ SNIS = ["localhost"]
Protocol = "http"
Host = "localhost"
Port = 48060

[Clients.Logging]
Protocol = "http"
Host = "localhost"
Port = 48061

[Clients.Scheduler]
Protocol = "http"
Expand Down
1 change: 0 additions & 1 deletion cmd/security-secrets-setup/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ func removeTestDirectories(configuration *config.ConfigurationStruct) {
}
}
if configuration != nil {
remove(configuration.Logging.File)
remove(configuration.SecretsSetup.WorkDir)
remove(configuration.SecretsSetup.DeployDir)
remove(configuration.SecretsSetup.CacheDir)
Expand Down
5 changes: 0 additions & 5 deletions cmd/security-secrets-setup/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[Writable]
LogLevel = 'INFO'

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ''

[SecretsSetup]
WorkDir = "/tmp/edgex/secrets-setup"
DeployDir = "/tmp/edgex/secrets"
Expand Down
4 changes: 0 additions & 4 deletions cmd/security-secrets-setup/testdata/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
[Writable]
LogLevel = 'DEBUG'

[Logging]
EnableRemote = false
File = './logs/security-secrets-setup.log'

[SecretsSetup]
WorkDir = "./workingtest"
DeployDir = "./deploytest"
Expand Down
10 changes: 3 additions & 7 deletions cmd/security-secretstore-setup/res-file-token-provider/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[Writable]
LogLevel = 'DEBUG'

[SecretService]
Scheme = "https"
Server = "edgex-vault"
Expand All @@ -10,10 +13,3 @@ PrivilegedTokenPath = "/run/edgex/secrets/tokenprovider/secrets-token.json"
ConfigFile = "res-file-token-provider/token-config.json"
OutputDir = "/tmp/edgex/secrets"
OutputFilename = "secrets-token.json"

[Writable]
LogLevel = 'DEBUG'

[Logging]
EnableRemote = false
File = ''
9 changes: 0 additions & 9 deletions cmd/security-secretstore-setup/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
[Writable]
LogLevel = 'DEBUG'

# Remote and file logging disabled so only stdout logging is used
[Logging]
EnableRemote = false
File = ""

[SecretService]
Scheme = "https"
Server = "edgex-vault"
Expand Down Expand Up @@ -76,10 +71,6 @@ RevokeRootTokens = true
Service = "scheduler"
Username = "scheduler"

[Databases.logging]
Service = "logging"
Username = "logging"

[Databases.application-service]
Service = "appservice"
Username = "appservice"
Expand Down
Loading