-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Start/stop monitoring server based on monitoring config (#3584
- Loading branch information
1 parent
318a4bc
commit 66e0f95
Showing
7 changed files
with
458 additions
and
11 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
changelog/fragments/1696249276-Start-stop-monitoring-server-based-on-monitoring-config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Kind can be one of: | ||
# - breaking-change: a change to previously-documented behavior | ||
# - deprecation: functionality that is being removed in a later release | ||
# - bug-fix: fixes a problem in a previous version | ||
# - enhancement: extends functionality but does not break or fix existing behavior | ||
# - feature: new functionality | ||
# - known-issue: problems that we are aware of in a given version | ||
# - security: impacts on the security of a product or a user’s deployment. | ||
# - upgrade: important information for someone upgrading from a prior version | ||
# - other: does not fit into any of the other categories | ||
kind: enhancement | ||
|
||
# Change summary; a 80ish characters long description of the change. | ||
summary: Start/stop monitoring server based on monitoring config | ||
|
||
# Long description; in case the summary is not enough to describe the change | ||
# this field accommodate a description without length limits. | ||
#description: | ||
|
||
# Affected component; a word indicating the component this changeset affects. | ||
component: elastic-agent | ||
|
||
# PR number; optional; the PR number that added the changeset. | ||
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. | ||
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. | ||
# Please provide it if you are adding a fragment for a different PR. | ||
pr: 3492 | ||
|
||
# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of). | ||
# If not present is automatically filled by the tooling with the issue linked to the PR number. | ||
issue: 2735 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
internal/pkg/agent/application/monitoring/reload/reload.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
// or more contributor license agreements. Licensed under the Elastic License; | ||
// you may not use this file except in compliance with the Elastic License. | ||
|
||
package reload | ||
|
||
import ( | ||
"sync/atomic" | ||
|
||
"github.com/elastic/elastic-agent/internal/pkg/agent/configuration" | ||
"github.com/elastic/elastic-agent/internal/pkg/agent/errors" | ||
aConfig "github.com/elastic/elastic-agent/internal/pkg/config" | ||
monitoringCfg "github.com/elastic/elastic-agent/internal/pkg/core/monitoring/config" | ||
"github.com/elastic/elastic-agent/pkg/core/logger" | ||
) | ||
|
||
// ServerController controls the server runtime | ||
type ServerController interface { | ||
Start() | ||
Stop() error | ||
} | ||
type serverConstructor func() (ServerController, error) | ||
|
||
type ServerReloader struct { | ||
s ServerController | ||
log *logger.Logger | ||
newServerFn serverConstructor | ||
|
||
config *monitoringCfg.MonitoringConfig | ||
isServerRunning atomic.Bool | ||
} | ||
|
||
func NewServerReloader(newServerFn serverConstructor, log *logger.Logger, mcfg *monitoringCfg.MonitoringConfig) *ServerReloader { | ||
sr := &ServerReloader{ | ||
log: log, | ||
config: mcfg, | ||
newServerFn: newServerFn, | ||
} | ||
|
||
return sr | ||
} | ||
|
||
func (sr *ServerReloader) Start() { | ||
if sr.s != nil && sr.isServerRunning.Load() { | ||
// server is already running | ||
return | ||
} | ||
|
||
sr.log.Info("Starting server") | ||
var err error | ||
sr.s, err = sr.newServerFn() | ||
if err != nil { | ||
sr.log.Errorf("Failed creating a server: %v", err) | ||
return | ||
} | ||
|
||
sr.s.Start() | ||
sr.log.Debugf("Server started") | ||
sr.isServerRunning.Store(true) | ||
} | ||
|
||
func (sr *ServerReloader) Stop() error { | ||
if sr.s == nil { | ||
// stopping not started server | ||
sr.isServerRunning.Store(false) | ||
return nil | ||
} | ||
sr.log.Info("Stopping server") | ||
|
||
sr.isServerRunning.Store(false) | ||
if err := sr.s.Stop(); err != nil { | ||
return err | ||
} | ||
|
||
sr.log.Debugf("Server stopped") | ||
sr.s = nil | ||
return nil | ||
} | ||
|
||
func (sr *ServerReloader) Reload(rawConfig *aConfig.Config) error { | ||
newConfig := configuration.DefaultConfiguration() | ||
if err := rawConfig.Unpack(&newConfig); err != nil { | ||
return errors.New(err, "failed to unpack monitoring config during reload") | ||
} | ||
|
||
sr.config = newConfig.Settings.MonitoringConfig | ||
|
||
shouldRunMetrics := sr.config.Enabled | ||
if shouldRunMetrics && !sr.isServerRunning.Load() { | ||
sr.Start() | ||
|
||
sr.isServerRunning.Store(true) | ||
return nil | ||
} | ||
|
||
if !shouldRunMetrics && sr.isServerRunning.Load() { | ||
sr.isServerRunning.Store(false) | ||
return sr.Stop() | ||
} | ||
|
||
return nil | ||
} |
Oops, something went wrong.