Skip to content

Commit

Permalink
fix(qs-license)!: Align field names used to store QS license data to …
Browse files Browse the repository at this point in the history
…existing field names in the database.

Fixes #1084
  • Loading branch information
Göran Sander committed Apr 12, 2024
1 parent 5c06f13 commit 2694d12
Showing 1 changed file with 28 additions and 29 deletions.
57 changes: 28 additions & 29 deletions src/lib/post_to_influxdb.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export async function postQlikSenseLicenseStatusToInfluxDB(qlikSenseLicenseStatu
const configTags = globals.config.get('Butler.qlikSenseLicense.licenseMonitor.destination.influxDb.tag.static');

const tags = {
license_type: 'analyzer_access',
butler_instance: instanceTag,
};

Expand All @@ -116,7 +115,7 @@ export async function postQlikSenseLicenseStatusToInfluxDB(qlikSenseLicenseStatu

// Is there any data for "analyzerAccess" license type?
if (qlikSenseLicenseStatus.analyzerAccess.enabled === true) {
tags.license_type = 'analyzer_access';
tags.license_type = 'analyzer';

datapoint.push({
measurement: 'qlik_sense_license',
Expand All @@ -134,65 +133,65 @@ export async function postQlikSenseLicenseStatusToInfluxDB(qlikSenseLicenseStatu

// Is there any data for "analyzerTimeAccess" license type?
if (qlikSenseLicenseStatus.analyzerTimeAccess.enabled === true) {
tags.license_type = 'analyzer_time_access';
tags.license_type = 'analyzer_capacity';

datapoint.push({
measurement: 'qlik_sense_license',
tags,
fields: {
allocatedMinutes: qlikSenseLicenseStatus.analyzerTimeAccess.allocatedMinutes,
unavailableMinutes: qlikSenseLicenseStatus.analyzerTimeAccess.unavailableMinutes,
usedMinutes: qlikSenseLicenseStatus.analyzerTimeAccess.usedMinutes,
allocated_minutes: qlikSenseLicenseStatus.analyzerTimeAccess.allocatedMinutes,
unavailable_minutes: qlikSenseLicenseStatus.analyzerTimeAccess.unavailableMinutes,
used_minutes: qlikSenseLicenseStatus.analyzerTimeAccess.usedMinutes,
},
});
}

// Is there any data for "loginAccess" license type?
if (qlikSenseLicenseStatus.loginAccess.enabled === true) {
tags.license_type = 'login_access';
// Is there any data for "professionalAccess" license type?
if (qlikSenseLicenseStatus.professionalAccess.enabled === true) {
tags.license_type = 'professional';

datapoint.push({
measurement: 'qlik_sense_license',
tags,
fields: {
allocatedTokens: qlikSenseLicenseStatus.loginAccess.allocatedTokens,
tokenCost: qlikSenseLicenseStatus.loginAccess.tokenCost,
unavailableTokens: qlikSenseLicenseStatus.loginAccess.unavailableTokens,
usedTokens: qlikSenseLicenseStatus.loginAccess.usedTokens,
allocated: qlikSenseLicenseStatus.professionalAccess.allocated,
available: qlikSenseLicenseStatus.professionalAccess.available,
excess: qlikSenseLicenseStatus.professionalAccess.excess,
quarantined: qlikSenseLicenseStatus.professionalAccess.quarantined,
total: qlikSenseLicenseStatus.professionalAccess.total,
used: qlikSenseLicenseStatus.professionalAccess.used,
},
});
}

// Is there any data for "professionalAccess" license type?
if (qlikSenseLicenseStatus.professionalAccess.enabled === true) {
tags.license_type = 'professional_access';
// Is there any data for "loginAccess" license type?
if (qlikSenseLicenseStatus.loginAccess.enabled === true) {
tags.license_type = 'token_login';

datapoint.push({
measurement: 'qlik_sense_license',
tags,
fields: {
allocated: qlikSenseLicenseStatus.professionalAccess.allocated,
available: qlikSenseLicenseStatus.professionalAccess.available,
excess: qlikSenseLicenseStatus.professionalAccess.excess,
quarantined: qlikSenseLicenseStatus.professionalAccess.quarantined,
total: qlikSenseLicenseStatus.professionalAccess.total,
used: qlikSenseLicenseStatus.professionalAccess.used,
allocated_tokens: qlikSenseLicenseStatus.loginAccess.allocatedTokens,
token_cost: qlikSenseLicenseStatus.loginAccess.tokenCost,
unavailable_tokens: qlikSenseLicenseStatus.loginAccess.unavailableTokens,
used_tokens: qlikSenseLicenseStatus.loginAccess.usedTokens,
},
});
}

// Is there any data for "userAccess" license type?
if (qlikSenseLicenseStatus.userAccess.enabled === true) {
tags.license_type = 'user_access';
tags.license_type = 'token_user';

datapoint.push({
measurement: 'qlik_sense_license',
tags,
fields: {
allocatedTokens: qlikSenseLicenseStatus.userAccess.allocatedTokens,
quarantinedTokens: qlikSenseLicenseStatus.userAccess.quarantinedTokens,
tokenCost: qlikSenseLicenseStatus.userAccess.tokenCost,
userTokens: qlikSenseLicenseStatus.userAccess.userTokens,
allocated_tokens: qlikSenseLicenseStatus.userAccess.allocatedTokens,
quarantined_tokens: qlikSenseLicenseStatus.userAccess.quarantinedTokens,
token_cost: qlikSenseLicenseStatus.userAccess.tokenCost,
used_tokens: qlikSenseLicenseStatus.userAccess.userTokens,
},
});
}
Expand All @@ -205,8 +204,8 @@ export async function postQlikSenseLicenseStatusToInfluxDB(qlikSenseLicenseStatu
measurement: 'qlik_sense_license',
tags,
fields: {
availableTokens: qlikSenseLicenseStatus.availableTokens,
totalTokens: qlikSenseLicenseStatus.totalTokens,
available_tokens: qlikSenseLicenseStatus.availableTokens,
total_tokens: qlikSenseLicenseStatus.totalTokens,
},
});
}
Expand Down

0 comments on commit 2694d12

Please sign in to comment.