Merge branch 'branches/rudder/8.1' into branches/rudder/8.2

Normation · Dec 9, 2024 · 9e545d0 · 9e545d0
2 parents f595149 + e877fd5
commit 9e545d0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/...er-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/...er-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
@@ -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/...er/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/...er/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
@@ -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/...urces/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/...urces/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
@@ -569,8 +569,8 @@ <h3 class="page-title">Debug information</h3>
               </div>
             </div>
 
-            <div class="inner-portlet">
-              <h3 class="page-title">Usage survey</h3>
+            <div class="inner-portlet d-none">
+              <h3>Usage survey</h3>
               <div class="portlet-content">
                 <div class="lift:administration.PropertiesManagement.sendMetricsConfiguration" id="sendMetrics">
                   <div class="explanation-text">
@@ -606,7 +606,6 @@ <h3 class="page-title">Usage survey</h3>
                       </lift:authz>
                     </div>
                   </form>
-
                   </div>
                 </div>
               </div>