Skip to content

Commit 8fce604

Browse files
committed
fix
1 parent 302dcba commit 8fce604

File tree

1 file changed

+0
-38
lines changed

1 file changed

+0
-38
lines changed

plugins/inputs/prometheus/target_allocator.go

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"gopkg.in/yaml.v3"
2929

3030
"github.com/aws/amazon-cloudwatch-agent/cfg/envconfig"
31-
"github.com/aws/amazon-cloudwatch-agent/internal/tls"
3231
)
3332

3433
var (
@@ -50,8 +49,6 @@ type TargetAllocatorManager struct {
5049
sm *scrape.Manager
5150
dm *discovery.Manager
5251
logger log.Logger
53-
configFile string
54-
certWatcher *tls.CertWatcher
5552
}
5653

5754
func isPodNameAvailable() bool {
@@ -113,7 +110,6 @@ func createTargetAllocatorManager(filename string, logger log.Logger, logLevel *
113110
taReadyCh: make(chan struct{}, 1),
114111
reloadConfigHandler: nil,
115112
logger: logger,
116-
configFile: filename,
117113
}
118114
err := tam.loadConfig(filename)
119115
if err != nil {
@@ -146,27 +142,6 @@ func (tam *TargetAllocatorManager) loadManager(logLevel *promlog.AllowedLevel) {
146142
}
147143

148144
tam.manager = tamanager.NewManager(receiverSettings, tam.config.TargetAllocator, (*promconfig.Config)(tam.config.PrometheusConfig), false)
149-
150-
cw, err := tls.NewCertWatcher(
151-
tam.config.TargetAllocator.TLSSetting.CertFile,
152-
tam.config.TargetAllocator.TLSSetting.KeyFile,
153-
tam.config.TargetAllocator.TLSSetting.CAFile,
154-
logger,
155-
)
156-
if err != nil {
157-
level.Error(tam.logger).Log("msg", "failed to create certWatcher", "err", err)
158-
} else {
159-
cw.RegisterCallback(func() {
160-
level.Info(tam.logger).Log("msg", "CertWatcher detected certificate update, reloading TLS configuration")
161-
tam.updateTLSConfig()
162-
})
163-
tam.certWatcher = cw
164-
go func() {
165-
if err := cw.Start(context.Background()); err != nil {
166-
level.Error(tam.logger).Log("msg", "certWatcher encountered error", "err", err)
167-
}
168-
}()
169-
}
170145
}
171146
func (tam *TargetAllocatorManager) loadConfig(filename string) error {
172147
config, err := loadConfigFromFilename(filename)
@@ -232,16 +207,3 @@ func (tam *TargetAllocatorManager) reloadConfigTicker() error {
232207
}()
233208
return nil
234209
}
235-
236-
func (tam *TargetAllocatorManager) updateTLSConfig() {
237-
newCfg, err := loadConfigFromFilename(tam.configFile)
238-
if err != nil {
239-
level.Error(tam.logger).Log("msg", "failed to reload config in updateTLSConfig", "err", err)
240-
return
241-
}
242-
newCfg.TargetAllocator.TLSSetting.CAFile = DefaultTLSCaFilePath
243-
newCfg.TargetAllocator.TLSSetting.CertFile = DefaultTLSCertFilePath
244-
newCfg.TargetAllocator.TLSSetting.KeyFile = DefaultTLSKeyFilePath
245-
tam.config = newCfg
246-
level.Info(tam.logger).Log("msg", "TLS configuration updated from certWatcher")
247-
}

0 commit comments

Comments
 (0)