Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #23926: Display group compliance #5290

Merged
merged 1 commit into from
Dec 30, 2023
Merged

Fixes #23926: Display group compliance #5290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 102 additions & 4 deletions ...sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/Compliance.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,31 @@ final case class ByNodeGroupCompliance(
compliance: ComplianceLevel,
mode: ComplianceModeName,
rules: Seq[ByNodeGroupRuleCompliance],
nodes: Seq[ByNodeNodeCompliance]
nodes: Seq[ByNodeGroupNodeCompliance]
)

final case class ByNodeGroupNodeCompliance(
id: NodeId,
name: String,
mode: ComplianceModeName,
compliance: ComplianceLevel,
policyMode: Option[PolicyMode],
rules: Seq[ByNodeRuleCompliance]
)

final case class ByNodeGroupRuleCompliance(
id: RuleId,
name: String,
compliance: ComplianceLevel,
directives: Seq[ByRuleDirectiveCompliance]
directives: Seq[ByNodeGroupByRuleDirectiveCompliance]
)

final case class ByNodeGroupByRuleDirectiveCompliance(
id: DirectiveId,
name: String,
compliance: ComplianceLevel,
policyMode: Option[PolicyMode],
components: Seq[ByRuleComponentCompliance]
)

final case class ByRuleDirectiveCompliance(
Expand Down Expand Up @@ -795,7 +812,7 @@ object JsonCompliance {
~ ("mode" -> nodeGroup.mode.name)
~ ("complianceDetails" -> percents(nodeGroup.compliance, precision))
~ ("rules" -> byRule(nodeGroup.rules, level, precision))
~ ("nodes" -> JArray(nodeGroup.nodes.map(_.toJson(level, precision)).toList)))
~ ("nodes" -> byNode(nodeGroup.nodes, level, precision)))
}

private[this] def byRule(
Expand All @@ -815,8 +832,88 @@ object JsonCompliance {
}
}

private[this] def byNode(
nodes: Seq[ByNodeGroupNodeCompliance],
level: Int,
precision: CompliancePrecision
): Option[JsonAST.JValue] = {
if (level < 2) None
else {
Some(nodes.map { node =>
(("id" -> node.id.value)
~ ("name" -> node.name)
~ ("mode" -> node.mode.name)
~ ("compliance" -> node.compliance.complianceWithoutPending(precision))
~ ("policyMode" -> node.policyMode.map(_.name).getOrElse("default"))
~ ("complianceDetails" -> percents(node.compliance, precision))
~ ("rules" -> byNodeRules(node.rules, level, precision)))
})
}
}

private[this] def byNodeRules(
rules: Seq[ByNodeRuleCompliance],
level: Int,
precision: CompliancePrecision
): Option[JsonAST.JValue] = {
if (level < 2) None
else {
Some(rules.map { rule =>
(
("id" -> rule.id.serialize)
~ ("name" -> rule.name)
~ ("compliance" -> rule.compliance.complianceWithoutPending(precision))
~ ("complianceDetails" -> percents(rule.compliance, precision))
~ ("directives" -> byNodeDirectives(rule.directives, level, precision))
)
})
}
}

private[this] def byNodeDirectives(
directives: Seq[ByNodeDirectiveCompliance],
level: Int,
precision: CompliancePrecision
): Option[JsonAST.JValue] = {
if (level < 2) None
else {
Some(directives.map { directive =>
(
("id" -> directive.id.serialize)
~ ("name" -> directive.name)
~ ("compliance" -> directive.compliance.complianceWithoutPending(precision))
~ ("complianceDetails" -> percents(directive.compliance, precision))
~ ("components" -> byNodeComponents(directive.components, level, precision))
)
})
}
}

private[this] def byNodeComponents(
comps: List[ComponentStatusReport],
level: Int,
precision: CompliancePrecision
): Option[JsonAST.JValue] = {
if (level < 3) None
else {
Some(comps.map {
case component =>
(
("name" -> component.componentName)
~ ("compliance" -> component.compliance.complianceWithoutPending(precision))
~ ("complianceDetails" -> percents(component.compliance, precision))
~ (component match {
case component: BlockStatusReport =>
("components" -> byNodeComponents(component.subComponents, level, precision))
case component: ValueStatusReport => ("values" -> values(component.componentValues, level))
})
)
})
}
}

private[this] def directives(
directives: Seq[ByRuleDirectiveCompliance],
directives: Seq[ByNodeGroupByRuleDirectiveCompliance],
level: Int,
precision: CompliancePrecision
): Option[JsonAST.JValue] = {
Expand All @@ -827,6 +924,7 @@ object JsonCompliance {
("id" -> directive.id.serialize)
~ ("name" -> directive.name)
~ ("compliance" -> directive.compliance.complianceWithoutPending(precision))
~ ("policyMode" -> directive.policyMode.map(_.name).getOrElse("default"))
~ ("complianceDetails" -> percents(directive.compliance, precision))
~ ("components" -> components(directive.components, level, precision))
)
Expand Down
11 changes: 7 additions & 4 deletions ...rces/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,12 +850,14 @@ class ComplianceAPIService(
ComplianceLevel.sum(reports.map(_.compliance)),
byDirectives.map {
case (directiveId, nodeDirectives) =>
ByRuleDirectiveCompliance(
ByNodeGroupByRuleDirectiveCompliance(
directiveId,
directiveLib.allDirectives.get(directiveId).map(_._2.name).getOrElse("Unknown directive"),
ComplianceLevel.sum(
nodeDirectives.map(_._2.compliance)
), // here we want the compliance by components of the directive.
),
directiveLib.allDirectives.get(directiveId).flatMap(_._2.policyMode),
// here we want the compliance by components of the directive.
// if level is high enough, get all components and group by their name
{
val byComponents: Map[String, immutable.Iterable[(NodeId, ComponentStatusReport)]] = if (computedLevel < 3) {
Expand Down Expand Up @@ -909,11 +911,12 @@ class ComplianceAPIService(
case (nodeId, status) if currentGroupNodeIds.contains(nodeId) =>
// For non global compliance, we only want the compliance for the rules in the group
val reports = status.reports.filter(r => isGlobalCompliance || ruleIds.contains(r.ruleId)).toSeq
ByNodeNodeCompliance(
ByNodeGroupNodeCompliance(
nodeId,
nodeFacts.get(nodeId).map(_.fqdn).getOrElse("Unknown node"),
ComplianceLevel.sum(reports.map(_.compliance)),
compliance.mode,
ComplianceLevel.sum(reports.map(_.compliance)),
nodeFacts.get(nodeId).flatMap(_.rudderSettings.policyMode),
reports.map(r => {
ByNodeRuleCompliance(
r.ruleId,
Expand Down
Loading