From 08180ab33dde4b3d337896da84e319a5807342f9 Mon Sep 17 00:00:00 2001 From: JimHagan Date: Fri, 31 Jan 2025 13:11:23 -0500 Subject: [PATCH 1/5] Initial commit of rmp kiosk --- entity-types/ext-rmp-kiosk/definition.yml | 56 +++++++++++++++++++ entity-types/ext-rmp-kiosk/golden_metrics.yml | 32 +++++++++++ 2 files changed, 88 insertions(+) create mode 100644 entity-types/ext-rmp-kiosk/definition.yml create mode 100644 entity-types/ext-rmp-kiosk/golden_metrics.yml diff --git a/entity-types/ext-rmp-kiosk/definition.yml b/entity-types/ext-rmp-kiosk/definition.yml new file mode 100644 index 000000000..71efe86cb --- /dev/null +++ b/entity-types/ext-rmp-kiosk/definition.yml @@ -0,0 +1,56 @@ +domain: EXT +type: RMP_KIOSK +configuration: + entityExpirationTime: EIGHT_DAYS +synthesis: + rules: + # RMP Kiosk (CSO) + - compositeIdentifier: + separator: "/" + attributes: + - country + - store.number + - device.type + - device.number + - identifier: hostname + name: hostname + encodeIdentifierInGUID: true + conditions: + attributes: + - country + present: true + - store.number + present: true + - device.type + value: "CSO" + - device.number + present: true + tags: + hostname: + multiValue: false + country: + multiValue: false + ttl: 7D + store.number: + multiValue: false + ttl: 7D + device.type: + multiValue: false + ttl: 7D + device.number: + multiValue: false + ttl: 7D + geo.location.lon: + multiValue: false + ttl: 7D + geo.location.lat: + multiValue: false + ttl: 7D +goldenTags: +- hostname +- country +- store.number +- device.type +- device.number +- geo.location.lon +- geo.location.lat \ No newline at end of file diff --git a/entity-types/ext-rmp-kiosk/golden_metrics.yml b/entity-types/ext-rmp-kiosk/golden_metrics.yml new file mode 100644 index 000000000..d60531ca6 --- /dev/null +++ b/entity-types/ext-rmp-kiosk/golden_metrics.yml @@ -0,0 +1,32 @@ +totalLogs: + title: Total Logs + unit: COUNT + query: + select: count(*) + from: Log + where: "" + facet: "" + eventId: entity.guid + eventName: entity.name + +logsByLevel: + title: Total Logs By Level + unit: COUNT + query: + select: count(*) + from: Log + where: "" + facet: "level" + eventId: entity.guid + eventName: entity.name + +logsByLevel: + title: Total Error Logs By Service Names + unit: COUNT + query: + select: count(*) + from: Log + where: "level='ERROR'" + facet: "service.name" + eventId: entity.guid + eventName: entity.name \ No newline at end of file From 37d3f7f5d1818709365e1d4a11f4082564e4e423 Mon Sep 17 00:00:00 2001 From: JimHagan Date: Fri, 31 Jan 2025 13:29:35 -0500 Subject: [PATCH 2/5] Changed to a simple identifier --- entity-types/ext-rmp-kiosk/definition.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/entity-types/ext-rmp-kiosk/definition.yml b/entity-types/ext-rmp-kiosk/definition.yml index 71efe86cb..4b6529462 100644 --- a/entity-types/ext-rmp-kiosk/definition.yml +++ b/entity-types/ext-rmp-kiosk/definition.yml @@ -5,18 +5,13 @@ configuration: synthesis: rules: # RMP Kiosk (CSO) - - compositeIdentifier: - separator: "/" - attributes: - - country - - store.number - - device.type - - device.number - - identifier: hostname + - identifier: hostname # Example: "UK00001CSO21" name: hostname encodeIdentifierInGUID: true conditions: attributes: + - newrelic.source + value: "api.logs" - country present: true - store.number @@ -46,6 +41,9 @@ synthesis: geo.location.lat: multiValue: false ttl: 7D + host.ip: + multiValue: false + ttl: 7D goldenTags: - hostname - country @@ -53,4 +51,5 @@ goldenTags: - device.type - device.number - geo.location.lon -- geo.location.lat \ No newline at end of file +- geo.location.lat +- host.ip \ No newline at end of file From 6231ca2c6f14f41e2cfd392ea2afa6e5d35c61c5 Mon Sep 17 00:00:00 2001 From: JimHagan Date: Fri, 31 Jan 2025 14:41:40 -0500 Subject: [PATCH 3/5] Fixed some validation errors --- entity-types/ext-rmp-kiosk/definition.yml | 24 ++++++------ entity-types/ext-rmp-kiosk/golden_metrics.yml | 38 +++++++++---------- validator/package.json | 2 +- validator/validator/package-lock.json | 6 +++ 4 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 validator/validator/package-lock.json diff --git a/entity-types/ext-rmp-kiosk/definition.yml b/entity-types/ext-rmp-kiosk/definition.yml index 4b6529462..6cb69cf6a 100644 --- a/entity-types/ext-rmp-kiosk/definition.yml +++ b/entity-types/ext-rmp-kiosk/definition.yml @@ -4,22 +4,20 @@ configuration: entityExpirationTime: EIGHT_DAYS synthesis: rules: - # RMP Kiosk (CSO) - - identifier: hostname # Example: "UK00001CSO21" + - identifier: hostname name: hostname encodeIdentifierInGUID: true conditions: - attributes: - - newrelic.source - value: "api.logs" - - country - present: true - - store.number - present: true - - device.type - value: "CSO" - - device.number - present: true + - attribute: newrelic.source + value: "api.logs" + - attribute: country + present: true + - attribute: store.number + present: true + - attribute: device.type + value: "CSO" + - attribute: device.number + present: true tags: hostname: multiValue: false diff --git a/entity-types/ext-rmp-kiosk/golden_metrics.yml b/entity-types/ext-rmp-kiosk/golden_metrics.yml index d60531ca6..fcebb320e 100644 --- a/entity-types/ext-rmp-kiosk/golden_metrics.yml +++ b/entity-types/ext-rmp-kiosk/golden_metrics.yml @@ -1,32 +1,30 @@ totalLogs: - title: Total Logs - unit: COUNT + title: "Total Logs" + unit: "COUNT" query: - select: count(*) - from: Log + select: "count(device.number) as 'Total Logs'" + from: "Log" where: "" facet: "" - eventId: entity.guid - eventName: entity.name - + eventId: "entity.guid" + eventName: "entity.name" logsByLevel: - title: Total Logs By Level - unit: COUNT + title: "Total Logs By Level" + unit: "COUNT" query: - select: count(*) - from: Log + select: "count(device.number) as 'Total Logs'" + from: "Log" where: "" facet: "level" - eventId: entity.guid - eventName: entity.name - + eventId: "entity.guid" + eventName: "entity.name" logsByLevel: - title: Total Error Logs By Service Names - unit: COUNT + title: "Total Error Logs By Service Names as 'Total Logs'" + unit: "COUNT" query: - select: count(*) - from: Log + select: "count(device.number)" + from: "Log" where: "level='ERROR'" facet: "service.name" - eventId: entity.guid - eventName: entity.name \ No newline at end of file + eventId: "entity.guid" + eventName: "entity.name" \ No newline at end of file diff --git a/validator/package.json b/validator/package.json index e2422c2e6..20a61b09e 100644 --- a/validator/package.json +++ b/validator/package.json @@ -4,7 +4,7 @@ "version": "1.0.0", "scripts": { "test": "jest", - "validate-definition": "ajv validate --errors=json -s schemas/entity-schema-v1.json -d '../entity-types/*/definition.yml' > /dev/null", + "validate-definition": "ajv validate --errors=json -s schemas/entity-schema-v1.json -d '../entity-types/*/definition.yml'", "validate-summary-metrics": "ajv validate --errors=json -s schemas/summary-metrics-schema-v1.json -d '../entity-types/*/summary_metrics.yml' > /dev/null", "validate-golden-metrics": "ajv validate --errors=json -s schemas/golden-metrics-schema-v1.json -d '../entity-types/*/golden_metrics.yml' > /dev/null", "validate-dashboard": "ajv validate --errors=json -s schemas/dashboard-schema-v1.json -d '../entity-types/*/*dashboard.json' > /dev/null", diff --git a/validator/validator/package-lock.json b/validator/validator/package-lock.json new file mode 100644 index 000000000..7551f7524 --- /dev/null +++ b/validator/validator/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "validator", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From 2b50d85d0315ee3b14218a098d566679942158f0 Mon Sep 17 00:00:00 2001 From: JimHagan Date: Fri, 31 Jan 2025 15:49:52 -0500 Subject: [PATCH 4/5] Got validations to pass --- entity-types/ext-rmp-kiosk/golden_metrics.yml | 30 ------------------- .../definition.yml | 0 entity-types/ext-rmp_kiosk/golden_metrics.yml | 30 +++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 entity-types/ext-rmp-kiosk/golden_metrics.yml rename entity-types/{ext-rmp-kiosk => ext-rmp_kiosk}/definition.yml (100%) create mode 100644 entity-types/ext-rmp_kiosk/golden_metrics.yml diff --git a/entity-types/ext-rmp-kiosk/golden_metrics.yml b/entity-types/ext-rmp-kiosk/golden_metrics.yml deleted file mode 100644 index fcebb320e..000000000 --- a/entity-types/ext-rmp-kiosk/golden_metrics.yml +++ /dev/null @@ -1,30 +0,0 @@ -totalLogs: - title: "Total Logs" - unit: "COUNT" - query: - select: "count(device.number) as 'Total Logs'" - from: "Log" - where: "" - facet: "" - eventId: "entity.guid" - eventName: "entity.name" -logsByLevel: - title: "Total Logs By Level" - unit: "COUNT" - query: - select: "count(device.number) as 'Total Logs'" - from: "Log" - where: "" - facet: "level" - eventId: "entity.guid" - eventName: "entity.name" -logsByLevel: - title: "Total Error Logs By Service Names as 'Total Logs'" - unit: "COUNT" - query: - select: "count(device.number)" - from: "Log" - where: "level='ERROR'" - facet: "service.name" - eventId: "entity.guid" - eventName: "entity.name" \ No newline at end of file diff --git a/entity-types/ext-rmp-kiosk/definition.yml b/entity-types/ext-rmp_kiosk/definition.yml similarity index 100% rename from entity-types/ext-rmp-kiosk/definition.yml rename to entity-types/ext-rmp_kiosk/definition.yml diff --git a/entity-types/ext-rmp_kiosk/golden_metrics.yml b/entity-types/ext-rmp_kiosk/golden_metrics.yml new file mode 100644 index 000000000..84723ade2 --- /dev/null +++ b/entity-types/ext-rmp_kiosk/golden_metrics.yml @@ -0,0 +1,30 @@ +totalLogs: + title: Total Logs + unit: COUNT + query: + select: count(*) + from: Log + where: "" + facet: "" + eventId: "entity.guid" + eventName: "entity.name" +totalLogsByLevel: + title: totalLogsByLevel + unit: COUNT + query: + select: count(*) + from: Log + where: "" + facet: "LEVEL" + eventId: "entity.guid" + eventName: "entity.name" +totalErrorLogsByService: + title: totalErrorLogsByService + unit: COUNT + query: + select: count(*) + from: Log + where: "" + facet: "service.name" + eventId: "entity.guid" + eventName: "entity.name" \ No newline at end of file From 3a9e5173a9ce6f45bf3eca10c3b42be4328238c1 Mon Sep 17 00:00:00 2001 From: JimHagan Date: Fri, 31 Jan 2025 15:52:30 -0500 Subject: [PATCH 5/5] undid accidental change --- validator/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validator/package.json b/validator/package.json index 20a61b09e..e2422c2e6 100644 --- a/validator/package.json +++ b/validator/package.json @@ -4,7 +4,7 @@ "version": "1.0.0", "scripts": { "test": "jest", - "validate-definition": "ajv validate --errors=json -s schemas/entity-schema-v1.json -d '../entity-types/*/definition.yml'", + "validate-definition": "ajv validate --errors=json -s schemas/entity-schema-v1.json -d '../entity-types/*/definition.yml' > /dev/null", "validate-summary-metrics": "ajv validate --errors=json -s schemas/summary-metrics-schema-v1.json -d '../entity-types/*/summary_metrics.yml' > /dev/null", "validate-golden-metrics": "ajv validate --errors=json -s schemas/golden-metrics-schema-v1.json -d '../entity-types/*/golden_metrics.yml' > /dev/null", "validate-dashboard": "ajv validate --errors=json -s schemas/dashboard-schema-v1.json -d '../entity-types/*/*dashboard.json' > /dev/null",