Pull request #128: OPMAAS-3832 try to get it smaller

Merge in OPAPM/coco_terraform_config from OPMAAS-3832 to master

* commit '238bc5d08400887ca889634544e1700998b7db37':
  OPMAAS-3832 try to get it smaller
  OPMAAS-3832 try to get it smaller
pull-requests/130/from
Doris Ruppert (ext.) 2023-04-25 07:32:05 +00:00
commit 3881bbe062
2 changed files with 90 additions and 115 deletions

View File

@ -15,16 +15,15 @@ module TP_Vehicle_Provisioning {
#metric expression of the calculation as done in data explorer ui #metric expression of the calculation as done in data explorer ui
metric_expression = <<EOT metric_expression = <<EOT
(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
fromRelationship.isServiceMethodOfService( fromRelationship.isServiceMethodOfService(
type(~"SERVICE~"),entityName.in( type(~"SERVICE~"),entityName.in(
~"WorkshopProvisioningService - provisioning - prod~", ~"WorkshopProvisioningService - provisioning - prod~",
~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"VpsJoynrApi - provisioning - prod~", ~"VpsJoynrApi - provisioning - prod~",
~"WorkshopProvisioningService - vps-prov - prod~", ~"WorkshopProvisioningService - vps-prov - prod~",
~"MQSession$FacadeMessageListener - vps-prov - prod~", ~"MQSession$FacadeMessageListener - vps-prov - prod~",
~"MQSession$FacadeMessageListener - vps-trigger - prod~", ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
@ -33,21 +32,18 @@ module TP_Vehicle_Provisioning {
~"MQSession$FacadeMessageListener - noptrigger - prod~", ~"MQSession$FacadeMessageListener - noptrigger - prod~",
~"ProvisioningService - nopprov - prod~", ~"ProvisioningService - nopprov - prod~",
~"NOP-Provisioning (/nop-prov) - nopprov - prod~", ~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvisioningService - provisioning - prod~", ~"ProvisioningService - provisioning - prod~",
~"NOP-Provisioning (/nop-prov) - provisioning - prod~" ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
) ,entityName.in(
)
,entityName.in(
~"vpsObtainProvisioningSync~", ~"vpsObtainProvisioningSync~",
~"Queue: PROV_TRIGGER_ACK-prod~", ~"Queue: PROV_TRIGGER_ACK-prod~",
~"Queue: PROV_TRIGGER_INTERNAL-prod~", ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
~"Queue: PROV_Trigger_IN-prod~", ~"Queue: PROV_Trigger_IN-prod~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"vpsObtainProvisioningSync~", ~"vpsObtainProvisioningSync~",
~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~", ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~", ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
@ -64,18 +60,15 @@ module TP_Vehicle_Provisioning {
~"Queue: NOP_Trigger_IN-prod~", ~"Queue: NOP_Trigger_IN-prod~",
~"Queue: NOP_TRIGGER_ACK-prod~", ~"Queue: NOP_TRIGGER_ACK-prod~",
~"Queue: NOP_TRIGGER_INTERNAL-prod~" ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
)"))))):splitBy()) )"))))):splitBy())/(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
/ fromRelationship.isServiceMethodOfService(
(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), type(~"SERVICE~"),entityName.in(
fromRelationship.isServiceMethodOfService(
type(~"SERVICE~"),entityName.in(
~"WorkshopProvisioningService - provisioning - prod~", ~"WorkshopProvisioningService - provisioning - prod~",
~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"VpsJoynrApi - provisioning - prod~", ~"VpsJoynrApi - provisioning - prod~",
~"WorkshopProvisioningService - vps-prov - prod~", ~"WorkshopProvisioningService - vps-prov - prod~",
~"MQSession$FacadeMessageListener - vps-prov - prod~", ~"MQSession$FacadeMessageListener - vps-prov - prod~",
~"MQSession$FacadeMessageListener - vps-trigger - prod~", ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
@ -84,21 +77,18 @@ module TP_Vehicle_Provisioning {
~"MQSession$FacadeMessageListener - noptrigger - prod~", ~"MQSession$FacadeMessageListener - noptrigger - prod~",
~"ProvisioningService - nopprov - prod~", ~"ProvisioningService - nopprov - prod~",
~"NOP-Provisioning (/nop-prov) - nopprov - prod~", ~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvisioningService - provisioning - prod~", ~"ProvisioningService - provisioning - prod~",
~"NOP-Provisioning (/nop-prov) - provisioning - prod~" ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
) ,entityName.in(
)
,entityName.in(
~"vpsObtainProvisioningSync~", ~"vpsObtainProvisioningSync~",
~"Queue: PROV_TRIGGER_ACK-prod~", ~"Queue: PROV_TRIGGER_ACK-prod~",
~"Queue: PROV_TRIGGER_INTERNAL-prod~", ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
~"Queue: PROV_Trigger_IN-prod~", ~"Queue: PROV_Trigger_IN-prod~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"vpsObtainProvisioningSync~", ~"vpsObtainProvisioningSync~",
~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~", ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~", ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
@ -115,14 +105,12 @@ module TP_Vehicle_Provisioning {
~"Queue: NOP_Trigger_IN-prod~", ~"Queue: NOP_Trigger_IN-prod~",
~"Queue: NOP_TRIGGER_ACK-prod~", ~"Queue: NOP_TRIGGER_ACK-prod~",
~"Queue: NOP_TRIGGER_INTERNAL-prod~" ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
)"))))):splitBy())) )"))))):splitBy()))
EOT EOT
#if not set (removed) it's defaulted to "-1d" #if not set (removed) it's defaulted to "-1d"
timeframe = "-1d" timeframe = "-1d"
#currently the only possible value #currently the only possible value
evaluation = "AGGREGATE" evaluation = "AGGREGATE"

View File

@ -12,90 +12,36 @@ module TP_Vehicle_Provisioning {
#entity selector object #entity selector object
filter = "" filter = ""
#metric expression of the calculation as done in data explorer ui #metric expression of the calculation as done in data explorer ui
metric_expression = <<EOT metric_expression = <<EOT
(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
fromRelationship.isServiceMethodOfService( fromRelationship.isServiceMethodOfService(
type(~"SERVICE~"),entityName.in( type(~"SERVICE~"),entityName.in(
~"WorkshopProvisioningService - provisioning - prod~", ~"WorkshopProvisioningService - provisioning - prod~",
~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"VpsJoynrApi - provisioning - prod~", ~"VpsJoynrApi - provisioning - prod~",
~"WorkshopProvisioningService - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-trigger - us~",
~"VpsJoynrApi - vps-prov - us~",
~"MQSession$FacadeMessageListener - noptrigger - prod~",
~"ProvisioningService - nopprov - prod~",
~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvisioningService - provisioning - prod~",
~"NOP-Provisioning (/nop-prov) - provisioning - prod~"
)
)
,entityName.in(
~"vpsObtainProvisioningSync~",
~"Queue: PROV_TRIGGER_ACK-prod~",
~"Queue: PROV_TRIGGER_INTERNAL-prod~",
~"Queue: PROV_Trigger_IN-prod~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"vpsObtainProvisioningSync~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
~"getNOPProvisioningDataForVehicle~",
~"acknowledgeNOPProvisioningDownload~",
~"getNOPProvisioningDataForVehicleBase64~",
~"/nop-prov/v2/mainprov/prov.do~",
~"Queue: NOP_ARCHIVE_IN-prod~",
~"Queue: NOP_Trigger_IN-prod~",
~"Queue: NOP_TRIGGER_ACK-prod~",
~"Queue: NOP_TRIGGER_INTERNAL-prod~"
)"))))):splitBy())
/
(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
fromRelationship.isServiceMethodOfService(
type(~"SERVICE~"),entityName.in(
~"WorkshopProvisioningService - provisioning - prod~",
~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"VpsJoynrApi - provisioning - prod~",
~"WorkshopProvisioningService - vps-prov - us~", ~"WorkshopProvisioningService - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-prov - us~", ~"MQSession$FacadeMessageListener - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-trigger - us~", ~"MQSession$FacadeMessageListener - vps-trigger - us~",
~"VpsJoynrApi - vps-prov - us~", ~"VpsJoynrApi - vps-prov - us~",
~"MQSession$FacadeMessageListener - noptrigger - prod~", ~"MQSession$FacadeMessageListener - noptrigger - prod~",
~"ProvisioningService - nopprov - prod~", ~"ProvisioningService - nopprov - prod~",
~"NOP-Provisioning (/nop-prov) - nopprov - prod~", ~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvisioningService - provisioning - prod~", ~"ProvisioningService - provisioning - prod~",
~"NOP-Provisioning (/nop-prov) - provisioning - prod~" ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
) ,entityName.in(
) ~"vpsObtainProvisioningSync~",
,entityName.in(
~"vpsObtainProvisioningSync~",
~"Queue: PROV_TRIGGER_ACK-prod~", ~"Queue: PROV_TRIGGER_ACK-prod~",
~"Queue: PROV_TRIGGER_INTERNAL-prod~", ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
~"Queue: PROV_Trigger_IN-prod~", ~"Queue: PROV_Trigger_IN-prod~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"vpsObtainProvisioningSync~", ~"vpsObtainProvisioningSync~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~", ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~", ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
@ -111,14 +57,55 @@ module TP_Vehicle_Provisioning {
~"Queue: NOP_Trigger_IN-prod~", ~"Queue: NOP_Trigger_IN-prod~",
~"Queue: NOP_TRIGGER_ACK-prod~", ~"Queue: NOP_TRIGGER_ACK-prod~",
~"Queue: NOP_TRIGGER_INTERNAL-prod~" ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
)"))))):splitBy())) )"))))):splitBy())/(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
EOT fromRelationship.isServiceMethodOfService(
type(~"SERVICE~"),entityName.in(
~"WorkshopProvisioningService - provisioning - prod~",
~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"VpsJoynrApi - provisioning - prod~",
~"WorkshopProvisioningService - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-prov - us~",
~"MQSession$FacadeMessageListener - vps-trigger - us~",
~"VpsJoynrApi - vps-prov - us~",
~"MQSession$FacadeMessageListener - noptrigger - prod~",
~"ProvisioningService - nopprov - prod~",
~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
~"ProvisioningService - provisioning - prod~",
~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
,entityName.in(
~"vpsObtainProvisioningSync~",
~"Queue: PROV_TRIGGER_ACK-prod~",
~"Queue: PROV_TRIGGER_INTERNAL-prod~",
~"Queue: PROV_Trigger_IN-prod~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"vpsObtainProvisioningSync~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
~"getNOPProvisioningDataForVehicle~",
~"acknowledgeNOPProvisioningDownload~",
~"getNOPProvisioningDataForVehicleBase64~",
~"/nop-prov/v2/mainprov/prov.do~",
~"Queue: NOP_ARCHIVE_IN-prod~",
~"Queue: NOP_Trigger_IN-prod~",
~"Queue: NOP_TRIGGER_ACK-prod~",
~"Queue: NOP_TRIGGER_INTERNAL-prod~"
)"))))):splitBy()))
EOT
#if not set (removed) it's defaulted to "-1d" #if not set (removed) it's defaulted to "-1d"
timeframe = "-1d" timeframe = "-1d"
#currently the only possible value #currently the only possible value
evaluation = "AGGREGATE" evaluation = "AGGREGATE"