Commit 6b769f17a1f6d76bb3fa0a9db2780c092ff2b079

Authored by Viacheslav Klimov
Committed by Andrew Shvayka
1 parent 9873115d

Created alarms limiting UI

@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </appender> 26 </appender>
27 27
28 <logger name="org.thingsboard.server" level="INFO" /> 28 <logger name="org.thingsboard.server" level="INFO" />
29 - <logger name="org.thingsboard.server.transport.snmp" level="TRACE" /> 29 + <logger name="org.thingsboard.server.transport.snmp" level="DEBUG" />
30 30
31 <!-- <logger name="org.thingsboard.server.service.queue" level="TRACE" />--> 31 <!-- <logger name="org.thingsboard.server.service.queue" level="TRACE" />-->
32 <!-- <logger name="org.thingsboard.server.service.transport" level="TRACE" />--> 32 <!-- <logger name="org.thingsboard.server.service.transport" level="TRACE" />-->
@@ -196,6 +196,18 @@ @@ -196,6 +196,18 @@
196 {{ 'tenant-profile.max-sms-range' | translate}} 196 {{ 'tenant-profile.max-sms-range' | translate}}
197 </mat-error> 197 </mat-error>
198 </mat-form-field> 198 </mat-form-field>
  199 + <mat-form-field class="mat-block">
  200 + <mat-label translate>tenant-profile.max-created-alarms</mat-label>
  201 + <input matInput required min="0" step="1"
  202 + formControlName="maxCreatedAlarms"
  203 + type="number">
  204 + <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('required')">
  205 + {{ 'tenant-profile.max-created-alarms-required' | translate}}
  206 + </mat-error>
  207 + <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('min')">
  208 + {{ 'tenant-profile.max-created-alarms-range' | translate}}
  209 + </mat-error>
  210 + </mat-form-field>
199 <mat-form-field class="mat-block"> 211 <mat-form-field class="mat-block">
200 <mat-label translate>tenant-profile.transport-tenant-msg-rate-limit</mat-label> 212 <mat-label translate>tenant-profile.transport-tenant-msg-rate-limit</mat-label>
201 <input matInput formControlName="transportTenantMsgRateLimit"> 213 <input matInput formControlName="transportTenantMsgRateLimit">
@@ -73,6 +73,7 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA @@ -73,6 +73,7 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
73 maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]], 73 maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]],
74 maxEmails: [null, [Validators.required, Validators.min(0)]], 74 maxEmails: [null, [Validators.required, Validators.min(0)]],
75 maxSms: [null, [Validators.required, Validators.min(0)]], 75 maxSms: [null, [Validators.required, Validators.min(0)]],
  76 + maxCreatedAlarms: [null, [Validators.required, Validators.min(0)]],
76 defaultStorageTtlDays: [null, [Validators.required, Validators.min(0)]] 77 defaultStorageTtlDays: [null, [Validators.required, Validators.min(0)]]
77 }); 78 });
78 this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => { 79 this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
@@ -2528,7 +2528,10 @@ @@ -2528,7 +2528,10 @@
2528 "max-emails-range": "Maximum number of emails sent can't be negative", 2528 "max-emails-range": "Maximum number of emails sent can't be negative",
2529 "max-sms": "Maximum number of SMS sent (0 - unlimited)", 2529 "max-sms": "Maximum number of SMS sent (0 - unlimited)",
2530 "max-sms-required": "Maximum number of SMS sent is required.", 2530 "max-sms-required": "Maximum number of SMS sent is required.",
2531 - "max-sms-range": "Maximum number of SMS sent can't be negative" 2531 + "max-sms-range": "Maximum number of SMS sent can't be negative",
  2532 + "max-created-alarms": "Maximum number of alarms created (0 - unlimited)",
  2533 + "max-created-alarms-required": "Maximum number of alarms created is required.",
  2534 + "max-created-alarms-range": "Maximum number of alarms created can't be negative"
2532 }, 2535 },
2533 "timeinterval": { 2536 "timeinterval": {
2534 "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }", 2537 "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",