@@ -76,8 +76,8 @@ describe('groupRulesByQuery', () => {
7676
7777 test ( 'at >= 7d a TRAFFIC rule and a latency rule split into hourly + daily groups' , ( ) => {
7878 const groups = groupRulesByQuery ( [
79- makeRule ( { id : 'a' , type : 'TRAFFIC' , timeWindowMinutes : 43200 } ) ,
80- makeRule ( { id : 'b' , type : 'LATENCY' , metric : 'P95' , timeWindowMinutes : 43200 } ) ,
79+ makeRule ( { id : 'a' , type : 'TRAFFIC' , timeWindowMinutes : 10080 } ) ,
80+ makeRule ( { id : 'b' , type : 'LATENCY' , metric : 'P95' , timeWindowMinutes : 10080 } ) ,
8181 ] ) ;
8282 expect ( groups . size ) . toBe ( 2 ) ;
8383 const tiers = [ ...groups . values ( ) ]
@@ -104,7 +104,6 @@ describe('evaluationIntervalMinutes', () => {
104104 expect ( evaluationIntervalMinutes ( 1440 ) ) . toBe ( 15 ) ;
105105 expect ( evaluationIntervalMinutes ( 1441 ) ) . toBe ( 30 ) ;
106106 expect ( evaluationIntervalMinutes ( 10080 ) ) . toBe ( 30 ) ;
107- expect ( evaluationIntervalMinutes ( 43200 ) ) . toBe ( 30 ) ;
108107 } ) ;
109108} ) ;
110109
@@ -125,7 +124,6 @@ describe('resolutionFor', () => {
125124 expect ( resolutionFor ( DAILY_THRESHOLD_MINUTES , true ) ) . toBe ( 'daily' ) ;
126125 // allowDailyRollup=false (a TRAFFIC group) never reaches daily.
127126 expect ( resolutionFor ( DAILY_THRESHOLD_MINUTES , false ) ) . toBe ( 'hourly' ) ;
128- expect ( resolutionFor ( 43200 , false ) ) . toBe ( 'hourly' ) ;
129127 } ) ;
130128} ) ;
131129
@@ -136,13 +134,13 @@ describe('isRuleDue', () => {
136134 const ago = ( minutes : number ) => new Date ( evalTime . getTime ( ) - minutes * 60_000 ) . toISOString ( ) ;
137135
138136 test ( 'a never-evaluated rule is always due' , ( ) => {
139- expect ( isRuleDue ( makeRule ( { lastEvaluatedAt : null , timeWindowMinutes : 43200 } ) , evalTime ) ) . toBe (
137+ expect ( isRuleDue ( makeRule ( { lastEvaluatedAt : null , timeWindowMinutes : 10080 } ) , evalTime ) ) . toBe (
140138 true ,
141139 ) ;
142140 } ) ;
143141
144- test ( '30 -day rule: due once its 30-min interval has elapsed' , ( ) => {
145- const base = { timeWindowMinutes : 43200 , state : 'NORMAL' as const } ;
142+ test ( '7 -day rule: due once its 30-min interval has elapsed' , ( ) => {
143+ const base = { timeWindowMinutes : 10080 , state : 'NORMAL' as const } ;
146144 expect ( isRuleDue ( makeRule ( { ...base , lastEvaluatedAt : ago ( 0 ) } ) , evalTime ) ) . toBe ( false ) ;
147145 expect ( isRuleDue ( makeRule ( { ...base , lastEvaluatedAt : ago ( 29 ) } ) , evalTime ) ) . toBe ( false ) ;
148146 expect ( isRuleDue ( makeRule ( { ...base , lastEvaluatedAt : ago ( 30 ) } ) , evalTime ) ) . toBe ( true ) ;
@@ -153,7 +151,7 @@ describe('isRuleDue', () => {
153151 const almost = new Date ( evalTime . getTime ( ) - ( 30 * 60_000 - 5_000 ) ) . toISOString ( ) ;
154152 expect (
155153 isRuleDue (
156- makeRule ( { timeWindowMinutes : 43200 , state : 'NORMAL' , lastEvaluatedAt : almost } ) ,
154+ makeRule ( { timeWindowMinutes : 10080 , state : 'NORMAL' , lastEvaluatedAt : almost } ) ,
157155 evalTime ,
158156 ) ,
159157 ) . toBe ( false ) ;
@@ -168,13 +166,13 @@ describe('isRuleDue', () => {
168166 test ( 'PENDING/RECOVERING keep full 1-min resolution regardless of window' , ( ) => {
169167 for ( const state of [ 'PENDING' , 'RECOVERING' ] as const ) {
170168 expect (
171- isRuleDue ( makeRule ( { timeWindowMinutes : 43200 , state, lastEvaluatedAt : ago ( 1 ) } ) , evalTime ) ,
169+ isRuleDue ( makeRule ( { timeWindowMinutes : 10080 , state, lastEvaluatedAt : ago ( 1 ) } ) , evalTime ) ,
172170 ) . toBe ( true ) ;
173171 }
174- // The same 30 -day rule in a steady state, 1 min after eval, is NOT due.
172+ // The same 7 -day rule in a steady state, 1 min after eval, is NOT due.
175173 for ( const state of [ 'NORMAL' , 'FIRING' ] as const ) {
176174 expect (
177- isRuleDue ( makeRule ( { timeWindowMinutes : 43200 , state, lastEvaluatedAt : ago ( 1 ) } ) , evalTime ) ,
175+ isRuleDue ( makeRule ( { timeWindowMinutes : 10080 , state, lastEvaluatedAt : ago ( 1 ) } ) , evalTime ) ,
178176 ) . toBe ( false ) ;
179177 }
180178 } ) ;
@@ -337,7 +335,7 @@ describe('queryClickHouseWindows', () => {
337335 { clientFilters : [ { name : 'web' , versions : null } ] } ,
338336 makeLogger ( ) . logger ,
339337 ) ;
340- await queryClickHouseWindows ( clickhouse , target , 43200 , conds , evalTime ) ;
338+ await queryClickHouseWindows ( clickhouse , target , DAILY_THRESHOLD_MINUTES , conds , evalTime ) ;
341339 const { sql } = calls [ 0 ] ;
342340 expect ( sql ) . toContain ( 'FROM operations_daily' ) ;
343341 expect ( sql ) . not . toContain ( '_by_target' ) ;
0 commit comments