Skip to content

RANGER-5553: Incorrect Tags count reported in SummaryTOTALTAGS metric from /service/metrics/json API #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RakeshGuptaDev wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

RANGER-5553: Incorrect Tags count reported in SummaryTOTALTAGS metric from /service/metrics/json API #953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion security-admin/src/main/java/org/apache/ranger/metrics/RangerMetricsFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public class RangerMetricsFetcher {

private final HashMap<String, Long> summaryReusable = new HashMap<>();
private final HashMap<Integer, Long> summaryPolicy = new HashMap<>();
private final Map<Integer, Long> summaryTagPolicy = new HashMap<>();

public Long getGroupCount() {
Long totalGroupCount = groupService.getAllGroupCount();
Expand Down Expand Up @@ -121,19 +122,21 @@ public Map<String, Long> getPolicyMetrics(Integer policyType) {

Map<String, Long> ret = new HashMap<>();
long total = 0L;
long totalTagPolicies = 0L;

for (Map.Entry<String, Long> entry : svcStore.getPolicyCountByTypeAndServiceType(policyType).entrySet()) {
ret.put(entry.getKey(), entry.getValue());

total += entry.getValue();

if ("tag".equalsIgnoreCase(entry.getKey())) {
summaryReusable.put("TotalTags", entry.getValue());
totalTagPolicies += entry.getValue().longValue();
}
}

ret.put("Total", total);
summaryPolicy.put(policyType, total);
summaryTagPolicy.put(policyType, totalTagPolicies);

return ret;
}
Expand Down Expand Up @@ -174,6 +177,9 @@ public Map<String, Long> getSummary() {
//policies
ret.put("TotalPolicies", summaryPolicy.values().stream().mapToLong(Long::longValue).sum());

//tag_policies
ret.put("TotalTagPolicies", summaryTagPolicy.values().stream().mapToLong(Long::longValue).sum());

//roles
ret.put("TotalRoles", daoMgr.getXXRole().getAllCount());

Expand All @@ -192,6 +198,9 @@ public Map<String, Long> getSummary() {
//x_policy_export_audit
ret.put("TotalPluginDownloads", daoMgr.getXXPolicyExportAudit().getAllCount());

//x_tag
ret.put("TotalTags", daoMgr.getXXTag().getAllCount());

return ret;
}

Expand Down