|
|
@ -70,7 +70,7 @@ export const localLogsConfigLabels = new Map<LocalLogsConfigs, string>([ |
|
|
[LocalLogsConfigs.tb_connection, 'TB Connection'], |
|
|
[LocalLogsConfigs.tb_connection, 'TB Connection'], |
|
|
[LocalLogsConfigs.storage, 'Storage'], |
|
|
[LocalLogsConfigs.storage, 'Storage'], |
|
|
[LocalLogsConfigs.extension, 'Extension'] |
|
|
[LocalLogsConfigs.extension, 'Extension'] |
|
|
]) |
|
|
]); |
|
|
|
|
|
|
|
|
export const logSavingPeriodTranslations = new Map<LogSavingPeriod, string>( |
|
|
export const logSavingPeriodTranslations = new Map<LogSavingPeriod, string>( |
|
|
[ |
|
|
[ |
|
|
@ -213,6 +213,18 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
}) |
|
|
}) |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this.gatewayConfigGroup.get('thingsboard.security').valueChanges.subscribe(security => { |
|
|
|
|
|
if (security.username) { |
|
|
|
|
|
this.clientIdUserNameFieldsToggle('clientId'); |
|
|
|
|
|
} else if (security.clientId) { |
|
|
|
|
|
this.clientIdUserNameFieldsToggle('username'); |
|
|
|
|
|
} else if (!security.username && !security.clientId) { |
|
|
|
|
|
this.clientIdUserNameFieldsToggle(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this.toggleRpcFields(false); |
|
|
|
|
|
|
|
|
this.gatewayConfigGroup.get('thingsboard.remoteConfiguration').valueChanges.subscribe(enabled => { |
|
|
this.gatewayConfigGroup.get('thingsboard.remoteConfiguration').valueChanges.subscribe(enabled => { |
|
|
if (!enabled) { |
|
|
if (!enabled) { |
|
|
this.openConfigurationConfirmDialog(); |
|
|
this.openConfigurationConfirmDialog(); |
|
|
@ -239,6 +251,10 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this.gatewayConfigGroup.get('grpc.enabled').valueChanges.subscribe(value => { |
|
|
|
|
|
this.toggleRpcFields(value); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
const securityGroup = this.gatewayConfigGroup.get('thingsboard.security') as FormGroup; |
|
|
const securityGroup = this.gatewayConfigGroup.get('thingsboard.security') as FormGroup; |
|
|
securityGroup.get('type').valueChanges.subscribe(type => { |
|
|
securityGroup.get('type').valueChanges.subscribe(type => { |
|
|
this.removeAllSecurityValidators(); |
|
|
this.removeAllSecurityValidators(); |
|
|
@ -262,15 +278,15 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
securityGroup.get('clientId').updateValueAndValidity(); |
|
|
securityGroup.get('clientId').updateValueAndValidity(); |
|
|
securityGroup.get('username').addValidators([Validators.required]); |
|
|
securityGroup.get('username').addValidators([Validators.required]); |
|
|
securityGroup.get('username').updateValueAndValidity(); |
|
|
securityGroup.get('username').updateValueAndValidity(); |
|
|
securityGroup.get('password').addValidators([Validators.required]); |
|
|
// securityGroup.get('password').addValidators([Validators.required]);
|
|
|
securityGroup.get('password').updateValueAndValidity(); |
|
|
// securityGroup.get('password').updateValueAndValidity();
|
|
|
} |
|
|
} |
|
|
securityGroup.updateValueAndValidity(); |
|
|
securityGroup.updateValueAndValidity(); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
securityGroup.get('caCert').valueChanges.subscribe(_ => this.cd.detectChanges()) |
|
|
securityGroup.get('caCert').valueChanges.subscribe(_ => this.cd.detectChanges()); |
|
|
securityGroup.get('privateKey').valueChanges.subscribe(_ => this.cd.detectChanges()) |
|
|
securityGroup.get('privateKey').valueChanges.subscribe(_ => this.cd.detectChanges()); |
|
|
securityGroup.get('cert').valueChanges.subscribe(_ => this.cd.detectChanges()) |
|
|
securityGroup.get('cert').valueChanges.subscribe(_ => this.cd.detectChanges()); |
|
|
|
|
|
|
|
|
const storageGroup = this.gatewayConfigGroup.get('storage') as FormGroup; |
|
|
const storageGroup = this.gatewayConfigGroup.get('storage') as FormGroup; |
|
|
storageGroup.get('type').valueChanges.subscribe(type => { |
|
|
storageGroup.get('type').valueChanges.subscribe(type => { |
|
|
@ -304,7 +320,8 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
this.attributeService.getEntityAttributes(entityId, AttributeScope.CLIENT_SCOPE, |
|
|
this.attributeService.getEntityAttributes(entityId, AttributeScope.CLIENT_SCOPE, |
|
|
['general_configuration', 'grpc_configuration', 'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel']).pipe( |
|
|
['general_configuration', 'grpc_configuration', 'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel']).pipe( |
|
|
mergeMap(attributes => attributes.length ? of(attributes) : this.attributeService.getEntityAttributes( |
|
|
mergeMap(attributes => attributes.length ? of(attributes) : this.attributeService.getEntityAttributes( |
|
|
entityId, AttributeScope.SHARED_SCOPE, ['general_configuration', 'grpc_configuration', 'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel'])) |
|
|
entityId, AttributeScope.SHARED_SCOPE, ['general_configuration', 'grpc_configuration', |
|
|
|
|
|
'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel'])) |
|
|
).subscribe(attributes => { |
|
|
).subscribe(attributes => { |
|
|
if (attributes.length) { |
|
|
if (attributes.length) { |
|
|
const general_configuration = attributes.find(attribute => attribute.key === 'general_configuration')?.value; |
|
|
const general_configuration = attributes.find(attribute => attribute.key === 'general_configuration')?.value; |
|
|
@ -330,6 +347,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
if (grpc_configuration) { |
|
|
if (grpc_configuration) { |
|
|
const configObj = {grpc: grpc_configuration}; |
|
|
const configObj = {grpc: grpc_configuration}; |
|
|
this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false}); |
|
|
this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false}); |
|
|
|
|
|
this.toggleRpcFields(grpc_configuration.enabled); |
|
|
} |
|
|
} |
|
|
if (logs_configuration) { |
|
|
if (logs_configuration) { |
|
|
const configObj = {logs: this.logsToObj(logs_configuration)}; |
|
|
const configObj = {logs: this.logsToObj(logs_configuration)}; |
|
|
@ -365,7 +383,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
this.gatewayConfigGroup.get('thingsboard.security.clientId').setValue(parsedValue.clientId); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.clientId').setValue(parsedValue.clientId); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.username').setValue(parsedValue.userName); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.username').setValue(parsedValue.userName); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.password').setValue(parsedValue.password); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.password').setValue(parsedValue.password); |
|
|
} else if (credentials.credentialsType === DeviceCredentialsType.X509_CERTIFICATE ) { |
|
|
} else if (credentials.credentialsType === DeviceCredentialsType.X509_CERTIFICATE) { |
|
|
//if sertificate is present set sertificate as present
|
|
|
//if sertificate is present set sertificate as present
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
@ -375,24 +393,68 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
logsToObj(logsConfig) { |
|
|
logsToObj(logsConfig) { |
|
|
const logsObject = { |
|
|
const logsObject = { |
|
|
local: {} |
|
|
local: {} |
|
|
} |
|
|
}; |
|
|
const logFormat = logsConfig.formatters.LogFormatter.format; |
|
|
const logFormat = logsConfig.formatters.LogFormatter.format; |
|
|
const dateFormat = logsConfig.formatters.LogFormatter.datefmt; |
|
|
const dateFormat = logsConfig.formatters.LogFormatter.datefmt; |
|
|
for (const localLogsConfigsKey of Object.keys(LocalLogsConfigs)) { |
|
|
for (const localLogsConfigsKey of Object.keys(LocalLogsConfigs)) { |
|
|
const handlerKey = localLogsConfigsKey + "Handler"; |
|
|
const handlerKey = localLogsConfigsKey + 'Handler'; |
|
|
logsObject[localLogsConfigsKey] = { |
|
|
logsObject[localLogsConfigsKey] = { |
|
|
logLevel: logsConfig.loggers[localLogsConfigsKey].level, |
|
|
logLevel: logsConfig.loggers[localLogsConfigsKey].level, |
|
|
filePath: logsConfig.handlers[handlerKey].filename.split('/'+localLogsConfigsKey)[0], |
|
|
filePath: logsConfig.handlers[handlerKey].filename.split('/' + localLogsConfigsKey)[0], |
|
|
backupCount: logsConfig.handlers[handlerKey].backupCount, |
|
|
backupCount: logsConfig.handlers[handlerKey].backupCount, |
|
|
savingTime: logsConfig.handlers[handlerKey].interval, |
|
|
savingTime: logsConfig.handlers[handlerKey].interval, |
|
|
savingPeriod: logsConfig.handlers[handlerKey].when, |
|
|
savingPeriod: logsConfig.handlers[handlerKey].when, |
|
|
} |
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return {local: logsObject, logFormat, dateFormat}; |
|
|
return {local: logsObject, logFormat, dateFormat}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
toggleRpcFields(enable: boolean) { |
|
|
|
|
|
const grpcGroup = this.gatewayConfigGroup.get('grpc') as FormGroup; |
|
|
|
|
|
if (enable) { |
|
|
|
|
|
grpcGroup.get('serverPort').enable(); |
|
|
|
|
|
grpcGroup.get('keepAliveTimeMs').enable(); |
|
|
|
|
|
grpcGroup.get('keepAliveTimeoutMs').enable(); |
|
|
|
|
|
grpcGroup.get('maxPingsWithoutData').enable(); |
|
|
|
|
|
grpcGroup.get('minTimeBetweenPingsMs').enable(); |
|
|
|
|
|
grpcGroup.get('minPingIntervalWithoutDataMs').enable(); |
|
|
|
|
|
} else { |
|
|
|
|
|
grpcGroup.get('serverPort').disable(); |
|
|
|
|
|
grpcGroup.get('keepAliveTimeMs').disable(); |
|
|
|
|
|
grpcGroup.get('keepAliveTimeoutMs').disable(); |
|
|
|
|
|
grpcGroup.get('maxPingsWithoutData').disable(); |
|
|
|
|
|
grpcGroup.get('minTimeBetweenPingsMs').disable(); |
|
|
|
|
|
grpcGroup.get('minPingIntervalWithoutDataMs').disable(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
clientIdUserNameFieldsToggle(type?: string) { |
|
|
|
|
|
const clientIdForm = this.gatewayConfigGroup.get('thingsboard.security.clientId'); |
|
|
|
|
|
const usernameForm = this.gatewayConfigGroup.get('thingsboard.security.username'); |
|
|
|
|
|
switch (type) { |
|
|
|
|
|
case 'clientId': |
|
|
|
|
|
if (clientIdForm.enabled) { |
|
|
|
|
|
clientIdForm.disable({emitEvent: false}); |
|
|
|
|
|
} |
|
|
|
|
|
break; |
|
|
|
|
|
case 'username': |
|
|
|
|
|
if (usernameForm.enabled) { |
|
|
|
|
|
usernameForm.disable({emitEvent: false}); |
|
|
|
|
|
} |
|
|
|
|
|
break; |
|
|
|
|
|
default: |
|
|
|
|
|
if (clientIdForm.disabled) { |
|
|
|
|
|
clientIdForm.enable({emitEvent: false}); |
|
|
|
|
|
} |
|
|
|
|
|
if (usernameForm.disabled) { |
|
|
|
|
|
usernameForm.enable({emitEvent: false}); |
|
|
|
|
|
} |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
addCommand(command?): void { |
|
|
addCommand(command?): void { |
|
|
const data = command || {}; |
|
|
const data = command || {}; |
|
|
const commandsFormArray = this.commandFormArray(); |
|
|
const commandsFormArray = this.commandFormArray(); |
|
|
@ -465,42 +527,42 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
disable_existing_loggers: false, |
|
|
disable_existing_loggers: false, |
|
|
formatters: { |
|
|
formatters: { |
|
|
LogFormatter: { |
|
|
LogFormatter: { |
|
|
class: "logging.Formatter", |
|
|
class: 'logging.Formatter', |
|
|
format: logsObj.logFormat, |
|
|
format: logsObj.logFormat, |
|
|
datefmt: logsObj.dateFormat, |
|
|
datefmt: logsObj.dateFormat, |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
handlers: { |
|
|
handlers: { |
|
|
consoleHandler: { |
|
|
consoleHandler: { |
|
|
class: "logging.StreamHandler", |
|
|
class: 'logging.StreamHandler', |
|
|
formatter: "LogFormatter", |
|
|
formatter: 'LogFormatter', |
|
|
level: "DEBUG", |
|
|
level: 'DEBUG', |
|
|
stream: "ext://sys.stdout" |
|
|
stream: 'ext://sys.stdout' |
|
|
}, |
|
|
}, |
|
|
databaseHandler: { |
|
|
databaseHandler: { |
|
|
class: "thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler", |
|
|
class: 'thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler', |
|
|
formatter: "LogFormatter", |
|
|
formatter: 'LogFormatter', |
|
|
filename: "./logs/database.log", |
|
|
filename: './logs/database.log', |
|
|
backupCount: 1, |
|
|
backupCount: 1, |
|
|
encoding: "utf-8" |
|
|
encoding: 'utf-8' |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
loggers: { |
|
|
loggers: { |
|
|
database: { |
|
|
database: { |
|
|
handlers: ["databaseHandler", "consoleHandler"], |
|
|
handlers: ['databaseHandler', 'consoleHandler'], |
|
|
level: "DEBUG", |
|
|
level: 'DEBUG', |
|
|
propagate: false |
|
|
propagate: false |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
root: { |
|
|
root: { |
|
|
level: "ERROR", |
|
|
level: 'ERROR', |
|
|
handlers: [ |
|
|
handlers: [ |
|
|
"consoleHandler" |
|
|
'consoleHandler' |
|
|
] |
|
|
] |
|
|
} |
|
|
} |
|
|
} |
|
|
}; |
|
|
for (const key of Object.keys(logsObj.local)) { |
|
|
for (const key of Object.keys(logsObj.local)) { |
|
|
logAttrObj.handlers[key+"Handler"] = this.createHandlerObj(logsObj.local[key], key); |
|
|
logAttrObj.handlers[key + 'Handler'] = this.createHandlerObj(logsObj.local[key], key); |
|
|
logAttrObj.loggers[key] = this.createLoggerObj(logsObj.local[key], key); |
|
|
logAttrObj.loggers[key] = this.createLoggerObj(logsObj.local[key], key); |
|
|
} |
|
|
} |
|
|
return logAttrObj; |
|
|
return logAttrObj; |
|
|
@ -508,22 +570,22 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
|
|
|
|
|
|
createHandlerObj(logObj, key) { |
|
|
createHandlerObj(logObj, key) { |
|
|
return { |
|
|
return { |
|
|
class: "thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler", |
|
|
class: 'thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler', |
|
|
formatter: "LogFormatter", |
|
|
formatter: 'LogFormatter', |
|
|
filename: `${logObj.filePath}/${key}.log`, |
|
|
filename: `${logObj.filePath}/${key}.log`, |
|
|
backupCount: logObj.backupCount, |
|
|
backupCount: logObj.backupCount, |
|
|
interval: logObj.savingTime, |
|
|
interval: logObj.savingTime, |
|
|
when: logObj.savingPeriod, |
|
|
when: logObj.savingPeriod, |
|
|
encoding: "utf-8" |
|
|
encoding: 'utf-8' |
|
|
} |
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
createLoggerObj(logObj, key) { |
|
|
createLoggerObj(logObj, key) { |
|
|
return { |
|
|
return { |
|
|
handlers: [`${key}Handler`, "consoleHandler"], |
|
|
handlers: [`${key}Handler`, 'consoleHandler'], |
|
|
level: logObj.logLevel, |
|
|
level: logObj.logLevel, |
|
|
propagate: false |
|
|
propagate: false |
|
|
} |
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
saveConfig(): void { |
|
|
saveConfig(): void { |
|
|
|
Maksym Dudnik
3 years ago