Merge pull request #61 from newrelic/fix_update_account_limit

Fix - Update account cardinality limit ti 10M and move to separate file.

Author: jake-codes

.DS_Store

@@ -3,12 +3,11 @@ import PropTypes from 'prop-types';
 
 import { getCardinalityForRule } from '../util/cardinality-helper';
 import { toggleMetric } from '../util/async';
+import { CARDINALITY_LIMIT_PER_RULE } from '../util/limits';
 
 import EnableSwitch from './table-components/enable-switch';
 import CardinalityPercent from './table-components/cardinality-percent';
 
-const CARDINALITY_LIMIT = 100000;
-
 export default class TableWrapper extends React.Component {
   render() {
     const {
@@ -50,7 +49,7 @@ export default class TableWrapper extends React.Component {
                 m.accountId,
                 m.id
               );
-              const violation = cardinality > CARDINALITY_LIMIT;
+              const violation = cardinality > CARDINALITY_LIMIT_PER_RULE;
               const selected =
                 metricSelection &&
                 metricSelection.id === m.id &&
@@ -82,7 +81,7 @@ export default class TableWrapper extends React.Component {
                   </td>
                   <CardinalityPercent
                     cardinality={cardinality}
-                    limit={CARDINALITY_LIMIT}
+                    limit={CARDINALITY_LIMIT_PER_RULE}
                     enabled={m.enabled}
                   />
                   <EnableSwitch

launchers/.DS_Store

@@ -9,6 +9,10 @@ import {
 import { parseCardinalityBatchResponse } from './cardinality-helper';
 
 import { parseNRQL, chunk, parseE2MMetricRuleListFromResponse } from './misc';
+import {
+  CARDINALITY_LIMIT_PER_ACCOUNT,
+  CARDINALITY_LIMIT_PER_RULE
+} from './limits';
 
 import {
   buildCardinalityTimeseriesQueryForBatch,
@@ -380,9 +384,6 @@ export async function loadCardinalityForAllEnabledRules(
   return cardinalitiesForAccount;
 }
 
-const CARDINALITY_LIMIT_PER_RULE = 100000;
-const CARDINALITY_LIMIT_PER_ACCOUNT = 5000000;
-
 function determineRuleCardinalityViolation(results) {
   const cardinalityArray = results.map(i => i.cardinality);
   const timeseriesMax = Math.max(...cardinalityArray);

nerdlets/.DS_Store

@@ -1,11 +1,16 @@
+import {
+  CARDINALITY_LIMIT_PER_ACCOUNT,
+  CARDINALITY_LIMIT_PER_RULE
+} from './limits';
+
 export function getTimeRangeFromCardinality(cardinality) {
   return cardinality.beginTimeSeconds;
 }
 
 function getColorForAccountTotal(chartdata) {
   let violation = false;
   for (let i = 0; i < chartdata.length; i++) {
-    if (chartdata[i].y > 5000000) {
+    if (chartdata[i].y > CARDINALITY_LIMIT_PER_ACCOUNT) {
       violation = true;
       break;
     }
@@ -16,7 +21,7 @@ function getColorForAccountTotal(chartdata) {
 function getColorForRule(chartdata) {
   let violation = false;
   for (let i = 0; i < chartdata.length; i++) {
-    if (chartdata[i].y > 100000) {
+    if (chartdata[i].y > CARDINALITY_LIMIT_PER_RULE) {
       violation = true;
       break;
     }
@@ -54,11 +59,11 @@ export function buildCardinalityChartData(
       data: nrqlStoreDataFormat
         ? timerangeArray.map(x => ({
             x,
-            y: 100000 /* This is the per rule max */
+            y: CARDINALITY_LIMIT_PER_RULE /* This is the per rule max */
           }))
         : cardinalities[0].map(cardinality => ({
             x: cardinality.beginTimeSeconds,
-            y: 100000
+            y: CARDINALITY_LIMIT_PER_RULE
           }))
     }
   ];
@@ -146,7 +151,7 @@ export function buildCardinalityTotalsChartData(
       },
       data: timerangeArray.map(x => ({
         x,
-        y: 5000000 /* This is the max total amount */
+        y: CARDINALITY_LIMIT_PER_ACCOUNT /* This is the max total amount */
       }))
     }
   ];

nerdlets/e2m-gui-nerdlet/rule-table.js

@@ -0,0 +1,2 @@
+export const CARDINALITY_LIMIT_PER_ACCOUNT = 10000000;
+export const CARDINALITY_LIMIT_PER_RULE = 100000;