cockpit/themes/packed/rngs/call.rng in cpee-2.0.23 vs cockpit/themes/packed/rngs/call.rng in cpee-2.0.24

- old
+ new

@@ -24,94 +24,121 @@ <data type="string" rngui:label="Value"/> </element> </zeroOrMore> </element> <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed"> - <element name="sensors" rngui:header="Sensors" rngui:fold="closed"> + + <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed"> <zeroOrMore rngui:label="Add Sensor"> <element name="sensor"> <element name="name" rngui:label="Label"> <data type="string" rngui:label="Label"/> </element> <element name="extractor_url" rngui:label="Extractor Url"> <data type="string" rngui:label="Service Url"/> </element> - <element name="extractor_arg" rngui:label="Extractor Argument"> - <data type="string" rngui:label="Value / Json"/> + <element name="extractor_params" rngui:label="Extractor Arguments:"> + <zeroOrMore rngui:label="Create Extractor Argument Pairs"> + <element rngui:label="Name"> + <anyName/> + <data type="string" rngui:label="Value / Json"/> + </element> + </zeroOrMore> </element> <element name="visualizer_url" rngui:label="Visualizer Url"> <data type="string" rngui:label="Service Url"/> </element> - <element name="visualizer_params" rngui:header="Visualizer Arguments"> + <element name="visualizer_params" rngui:label="Visualizer Arguments"> <zeroOrMore rngui:label="Create Visualizer Argument Pairs"> <element rngui:label="Name"> <anyName/> <data type="string" rngui:label="Value / Json"/> </element> </zeroOrMore> </element> </element> </zeroOrMore> </element> - <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed"> - <zeroOrMore rngui:label="Add Aggregator"> - <element name="aggregator"> + + <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed"> + <zeroOrMore rngui:label="Add Impact Profile"> + <element name="ip"> <element name="name" rngui:label="Label"> <data type="string" rngui:label="Label"/> </element> - <element name="aggregator_url" rngui:label="Aggregator Url"> - <data type="string" rngui:label="Service Url"/> - </element> - <element name="aggregator_arg" rngui:label="Aggregator Argument"> - <data type="string" rngui:label="Value / Json"/> - </element> - </element> - </zeroOrMore> - </element> - <element name="costs" rngui:header="Costs" rngui:fold="closed"> - <zeroOrMore rngui:label="Create Cost Factor"> - <element name="cost_factor"> - <element name="name" rngui:label="Label"> - <data type="string" rngui:label="Label"/> - </element> <element name="target" rngui:label="Target Value"> <data type="string" rngui:label="Value"/> </element> + <element name="ifs" rngui:header="Impact Factors"> + <zeroOrMore rngui:label="Add Impact Factor"> + <element name="if"> + <element name="ivs" rngui:header="Impact Values"> + <zeroOrMore rngui:label="Add Impact Value "> + <element name="iv"> + <element name="extractor_url" rngui:label="Extractor Url"> + <data type="string" rngui:label="Service Url + Parameters"/> + </element> + <element name="aggregator_url" rngui:label="Aggregator Url"> + <data type="string" rngui:label="Service Url + Parameters"/> + </element> + </element> + </zeroOrMore> + </element> + <element name="aggregator_url" rngui:label="Impact Function Url"> + <data type="string" rngui:label="Service Url + Parameters"/> + </element> + </element> + </zeroOrMore> + </element> <element name="vfunc_url" rngui:label="Violation Function Url"> - <data type="string" rngui:label="Service Url"/> + <data type="string" rngui:label="Service Url + Parameters"/> </element> - <element name="vfunc_arg" rngui:label="Violation Function Argument"> - <data type="string" rngui:label="Service Url"/> - </element> - <element name="vcost" rngui:label="Violation Cost"> - <data type="string" rngui:label="Value"/> - </element> </element> </zeroOrMore> </element> + </element> <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed"> <element name="url" rngui:label='HTML Snippet'> <data type="string" rngui:label="url to report snippet"/> </element> </element> </element> <element name="annotations" rngui:header="Annotations"> <element name="_timing" rngui:header="Timing" rngui:fold="closed"> - <element name="_timing_wait" rngui:label="&#x3C9; - Wait"> - <data type="float" rngui:label="[0,1]" rngui:default="0.5"/> + <element name="_timing_weight" rngui:label="&#x3C9; - Weight"> + <data type="float" rngui:label="[0,1]"/> </element> - <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold"> - <data type="float" rngui:label="[0,3,n]" rngui:default="3"/> - </element> - <element name="_timing_min" rngui:label="Min in min"> - <data type="float" rngui:label="Minutes"/> - </element> - <element name="_timing_max" rngui:label="Max in min"> - <data type="float" rngui:label="Minutes"/> - </element> <element name="_timing_avg" rngui:label="Avg in min"> <data type="float" rngui:label="Minutes"/> + </element> + <element name="explanations" rngui:header="Explanations"> + <zeroOrMore rngui:label="Add Explanation"> + <element name="explanation"> + <element name="type" rngui:label="Type"> + <choice> + <value>&gt;</value> + <value>&lt;</value> + </choice> + </element> + <element name="deviation" rngui:label="Deviation"> + <data type="float" rngui:label="Minutes"/> + </element> + <element name="behaviour" rngui:label="Behaviour"> + <choice> + <value>Immediately</value> + <value>Wait until next</value> + <value>Use grace period value</value> + </choice> + </element> + <element name="grace" rngui:label="Grace Period" rngui:default="0.0"> + <data type="float" rngui:label="Minutes"/> + </element> + <element name="text" rngui:label="Explanation"> + <data type="string" rngui:label="Patterns"/> + </element> + </element> + </zeroOrMore> </element> </element> <element name="_notes" rngui:header="Notes" rngui:fold="closed"> <element name="_notes_general" rngui:label="General"> <text rngui:wrap="true" rngui:label="Notes"/>