Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting #3650
Conversation
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
VinceMacBuche
force-pushed
the
ust_19323/be_able_to_group_reporting_and_methods_so_that_we_have_clearer_techniques_and_a_better_reporting
branch
from
0863f40
to
bb47760
Compare
VinceMacBuche
commented
May 27, 2021
.../rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala
Show resolved
Hide resolved
VinceMacBuche
force-pushed
the
ust_19323/be_able_to_group_reporting_and_methods_so_that_we_have_clearer_techniques_and_a_better_reporting
branch
from
bb47760
to
985c3a1
Compare
|
Commit modified |
fanf
reviewed
Jun 8, 2021
.../rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala
Outdated
Show resolved
Hide resolved
| @@ -437,3 +436,20 @@ object DisplayPriority { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| sealed trait CompositionRule | |||
| case object WorstReport extends CompositionRule | |||
There was a problem hiding this comment.
can you put the cases in the object and mark them final (it's the conventional pattern used elsewhere)
.../rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala
Outdated
Show resolved
Hide resolved
...s/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala
Outdated
Show resolved
Hide resolved
.../rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala
Outdated
Show resolved
Hide resolved
.../rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala
Outdated
Show resolved
Hide resolved
...es/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala
Outdated
Show resolved
Hide resolved
...es/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala
Outdated
Show resolved
Hide resolved
...er/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala
Outdated
Show resolved
Hide resolved
fanf
reviewed
Jun 8, 2021
webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewBlock.elm
Outdated
Show resolved
Hide resolved
fanf
reviewed
Jun 8, 2021
| |> appendChild cloneIcon | ||
| removeIcon = element "i" |> addClass "fa fa-times-circle" | ||
| removeButton = element "button" | ||
| |> addClass "text-danger method-action tooltip-bs" |
There was a problem hiding this comment.
The remove button does not work for components in groups
|
PR updated with a new commit |
10 similar comments
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
VinceMacBuche
force-pushed
the
ust_19323/be_able_to_group_reporting_and_methods_so_that_we_have_clearer_techniques_and_a_better_reporting
branch
from
05700ee
to
f16781f
Compare
|
PR updated with a new commit |
5 similar comments
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
|
PR updated with a new commit |
fanf
reviewed
Jul 6, 2021
...s/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala
Show resolved
Hide resolved
fanf
reviewed
Jul 6, 2021
| case WorstReport => | ||
| ComplianceLevel.compute(ReportType.getWorseType(subComponents.map(_.status)) :: Nil) | ||
| case SumReport => ComplianceLevel.sum(subComponents.map(_.compliance)) | ||
| case FocusReport(component) => ComplianceLevel.sum(findChildren(component).map(_.compliance)) |
There was a problem hiding this comment.
I think that if the component is not found, it should not be 0 or whatever ComplianceLevel.sum(Nil) does, but it should be a missing report error.
| componentName : String | ||
| //only one ComponentValueStatusReport by value | ||
| //only one ComponentValueStatusReport by valuex. |
| case _ => Left(Unexpected(s"Value '${value}' is not a valid reporting composition rule.")) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I would prefer that each ReportingLogic has a name attribute, and that name is used everywhere when the string is needed. If we want to ensure consistency.
So something like:
sealed trait ReportingLogic { def name: Sring}
final case object WorstReport extends ReportingLogic { val name = "worst" }
final case class FocusReport(component : String) extends ReportingLogic { val name = "focus:${component}" }
etc
| import ReportingLogic._ | ||
| (("componentName" -> c.componentName) | ||
| ~ ("composition" -> (c.reportingLogic match { | ||
| case WorstReport => "worst" |
| reportingLogic match { | ||
| case WorstReport => ("type"-> "worst") | ||
| case SumReport => ("type"-> "sum") | ||
| case FocusReport(component) => ("type" -> "focus") ~ ("value" -> component) |
There was a problem hiding this comment.
ok, so you need to split name and serialize in ReportingLogic (with by default val serialize = name and for focus report something different)
| val reportingLogic = block.reportingLogic match { | ||
| case WorstReport => "worst" | ||
| case SumReport => "sum" | ||
| case FocusReport(component) => s"focus:${component}" |
|
|
||
| val t5 = System.nanoTime | ||
| u4 += t5-t4 | ||
|
|
||
|
|
||
| (missing, unexpected, expected) | ||
| ( unexpected, expected) |
There was a problem hiding this comment.
I don't get why you don't have missing at all here: the case is still possible if some reports were lost (are more likely because of bad reporting logic somewhere)
There was a problem hiding this comment.
They are already treated in another branch, i got duplicated missing if i keep it
There was a problem hiding this comment.
yes the difference is here: https://github.com/Normation/rudder/pull/3650/files/b5ee112bc450916897f1e3cbd6a032ff6feb5b21#diff-32bcd76fdbbd93efed1323a8e48c79320607d7ef97094e819936a74e6fab88feR938
Previously we treated missing reports in its own place, so we were parsing all reports to check missing components so we produced our missing reports ,then when doing expected we were filtering missing key ( by using okKeys)
in expected we now look for all expected keys, and when treating a component if we don't have reports we produce a missing
So we were going through all expected reports twice so find all missing and now this is done in one go
|
PR updated with a new commit |
1 similar comment
|
PR updated with a new commit |
|
OK, squash merging this PR |
…clearer techniques and a better reporting
… Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
…ock and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
…ponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
…iqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
…t et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
…omponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
… fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Rename GroupComponent et UniqueComponent into Block and Value Fixes #19323: Be able to group reporting and methods so that we have clearer techniques and a better reporting
Normation-Quality-Assistant
force-pushed
the
ust_19323/be_able_to_group_reporting_and_methods_so_that_we_have_clearer_techniques_and_a_better_reporting
branch
from
ecca3be
to
f5e8a9f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/19323