diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala index b893c3040ad..02a5c9498fd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala @@ -141,7 +141,6 @@ class SystemVariableServiceImpl( getModifiedFilesTtl: () => Box[Int], getCfengineOutputsTtl: () => Box[Int], - getSendMetrics: () => Box[Option[SendMetrics]], getReportProtocolDefault: () => Box[AgentReportingProtocol] ) extends SystemVariableService with Loggable { @@ -188,15 +187,8 @@ class SystemVariableServiceImpl( val varServerVersion = systemVariableSpecService.get("SERVER_VERSION").toVariable(Seq(serverVersion)) - import SendMetrics.* - val sendMetricsValue = getSendMetrics().getOrElse(None) match { - case None => "no" - case Some(NoMetrics) => "no" - case Some(MinimalMetrics) => "minimal" - case Some(CompleteMetrics) => "complete" - } - - val varSendMetrics = systemVariableSpecService.get("SEND_METRICS").toVariable(Seq(sendMetricsValue)) + // always disable send metrics - see https://issues.rudder.io/issues/25982 + val varSendMetrics = systemVariableSpecService.get("SEND_METRICS").toVariable(Seq("no")) logger.trace("Global system variables done") val vars = { @@ -225,7 +217,7 @@ class SystemVariableServiceImpl( // for this method to work properly // The global system variables are computed before (in the method up there), and - // can be overriden by some node specific parameters (especially, the schedule for + // can be overridden by some node specific parameters (especially, the schedule for // policy servers) def getSystemVariables( nodeInfo: CoreNodeFact, diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala index e1525a81fa6..135e050fd2d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala @@ -312,7 +312,6 @@ class MockTechniques(configurationRepositoryRoot: File, mockGit: MockGitConfigRe getModifiedFilesTtl = () => Full(30), getCfengineOutputsTtl = () => Full(7), - getSendMetrics = () => Full(None), getReportProtocolDefault = () => Full(AgentReportingHTTPS) ) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala index ff14efde0e1..8cfdc103290 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala @@ -829,7 +829,6 @@ class TestNodeConfiguration( getModifiedFilesTtl = () => Full(30), getCfengineOutputsTtl = () => Full(7), - getSendMetrics = () => Full(None), getReportProtocolDefault = () => Full(AgentReportingHTTPS) ) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala index f2e4d0c02b7..f17b7df4724 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala @@ -2984,7 +2984,6 @@ object RudderConfigInit { () => configService.relay_server_syncsharedfiles().toBox, () => configService.cfengine_modified_files_ttl().toBox, () => configService.cfengine_outputs_ttl().toBox, - () => configService.send_server_metrics().toBox, () => configService.rudder_report_protocol_default().toBox ) lazy val rudderCf3PromisesFileWriterService = new PolicyWriterServiceImpl( diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html index c49cfe89e1e..5d57fb9764a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html +++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html @@ -569,8 +569,8 @@

Debug information

-
-

Usage survey

+
+

Usage survey

@@ -606,7 +606,6 @@

Usage survey

-