From 0c7828a1aa8432d785480ae6813363e6f191e515 Mon Sep 17 00:00:00 2001
From: Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>
Date: Tue, 1 Mar 2022 13:00:40 +0200
Subject: ...G...... [ZBXNEXT-7116] backported ability to force active checks
 on restart

---
 src/go/conf/zabbix_agent2.conf             |  2 --
 src/go/internal/agent/scheduler/manager.go | 15 ++-------------
 src/go/internal/agent/scheduler/query.go   |  3 ++-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/go/conf/zabbix_agent2.conf b/src/go/conf/zabbix_agent2.conf
index 66c6234a043..fcebe6028e3 100644
--- a/src/go/conf/zabbix_agent2.conf
+++ b/src/go/conf/zabbix_agent2.conf
@@ -928,5 +928,3 @@ ControlSocket=/tmp/agent.sock
 # Range: 0-1
 # Default:
 # ForceActiveChecksOnStart=0
-
-# Include configuration files for plugins
diff --git a/src/go/internal/agent/scheduler/manager.go b/src/go/internal/agent/scheduler/manager.go
index 1aa27909e67..58fa08384dd 100644
--- a/src/go/internal/agent/scheduler/manager.go
+++ b/src/go/internal/agent/scheduler/manager.go
@@ -538,20 +538,10 @@ func NewManager(options *agent.AgentOptions) (mannager *Manager, err error) {
 }
 
 func getPluginOptions(optsRaw interface{}, name string) (capacity int, forceActiveChecksOnStart int) {
-	pluginCap, pluginSystemCap, pluginForceActiveChecksOnStart := getPluginOpts(optsRaw, name)
+	pluginSystemCap, pluginForceActiveChecksOnStart := getPluginOpts(optsRaw, name)
 
 	if pluginSystemCap > 0 {
-		if pluginCap > 0 {
-			log.Warningf("both Plugins.%s.Capacity and Plugins.%s.System.Capacity configuration parameters are set, using System.Capacity: %d",
-				name, name, pluginSystemCap)
-		}
 		capacity = pluginSystemCap
-	} else if pluginCap > 0 {
-		log.Warningf(
-			"plugin %s configuration parameter Plugins.%s.Capacity is deprecated, use Plugins.%s.System.Capacity instead",
-			name, name, name,
-		)
-		capacity = pluginCap
 	} else {
 		capacity = plugin.DefaultCapacity
 	}
@@ -571,7 +561,7 @@ func getPluginOptions(optsRaw interface{}, name string) (capacity int, forceActi
 	return
 }
 
-func getPluginOpts(optsRaw interface{}, name string) (pluginCap, pluginSystemCap int, forceActiveChecksOnStart *int) {
+func getPluginOpts(optsRaw interface{}, name string) (pluginSystemCap int, forceActiveChecksOnStart *int) {
 	var opt pluginOptions
 
 	if optsRaw == nil {
@@ -584,7 +574,6 @@ func getPluginOpts(optsRaw interface{}, name string) (pluginCap, pluginSystemCap
 		return
 	}
 
-	pluginCap = opt.Capacity
 	pluginSystemCap = opt.Capacity
 	forceActiveChecksOnStart = opt.ForceActiveChecksOnStart
 
diff --git a/src/go/internal/agent/scheduler/query.go b/src/go/internal/agent/scheduler/query.go
index e499c041fc8..b1eac3c0641 100644
--- a/src/go/internal/agent/scheduler/query.go
+++ b/src/go/internal/agent/scheduler/query.go
@@ -58,7 +58,8 @@ func (m *Manager) getStatus() (result string) {
 	for _, info := range infos {
 
 		status.WriteString(fmt.Sprintf("[%s]\nactive: %t\ncapacity: %d/%d\ncheck on start: %d\ntasks: %d\n",
-			info.ref.name(), info.ref.active(), info.ref.usedCapacity, info.ref.maxCapacity, info.ref.forceActiveChecksOnStart, len(info.ref.tasks)))
+			info.ref.name(), info.ref.active(), info.ref.usedCapacity, info.ref.maxCapacity,
+			info.ref.forceActiveChecksOnStart, len(info.ref.tasks)))
 
 		sort.Slice(info.metrics, func(l, r int) bool { return info.metrics[l].Key < info.metrics[r].Key })
 		for _, metric := range info.metrics {
-- 
cgit v1.2.3