feat(pkger): add parser support for notification rules

jspenc72 · Dec 19, 2019 · 1d3e0da · 1d3e0da
1 parent 5b859a2
commit 1d3e0da
Show file tree

Hide file tree

Showing 7 changed files with 669 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,14 @@
 
 ### Features
 
-1. [16234](https://github.com/influxdata/influxdb/pull/16234): add support for notification endpoints to influx templates/pkgs.
-2. [16242](https://github.com/influxdata/influxdb/pull/16242): drop id prefix for secret key requirement for notification endpoints 
-3. [16259](https://github.com/influxdata/influxdb/pull/16259): add support for check resource to pkger parser 
-4. [16262](https://github.com/influxdata/influxdb/pull/16262): add support for check resource dry run functionality 
-5. [16275](https://github.com/influxdata/influxdb/pull/16275): add support for check resource apply functionality 
-6. [16283](https://github.com/influxdata/influxdb/pull/16283): add support for check resource export functionality 
+1. [16234](https://github.com/influxdata/influxdb/pull/16234): Add support for notification endpoints to influx templates/pkgs.
+2. [16242](https://github.com/influxdata/influxdb/pull/16242): Drop id prefix for secret key requirement for notification endpoints
+3. [16259](https://github.com/influxdata/influxdb/pull/16259): Add support for check resource to pkger parser
+4. [16262](https://github.com/influxdata/influxdb/pull/16262): Add support for check resource dry run functionality
+5. [16275](https://github.com/influxdata/influxdb/pull/16275): Add support for check resource apply functionality
+6. [16283](https://github.com/influxdata/influxdb/pull/16283): Add support for check resource export functionality
 1. [16212](https://github.com/influxdata/influxdb/pull/16212): Add new kv.ForwardCursor interface
+1. [16297](https://github.com/influxdata/influxdb/pull/16297): Add support for notification rule to pkger parser
 
 ### Bug Fixes
 

diff --git a/pkger/clone_resource.go b/pkger/clone_resource.go
@@ -89,8 +89,8 @@ func checkToResource(ch influxdb.Check, name string) Resource {
 	assignBase := func(base icheck.Base) {
 		r[fieldQuery] = base.Query.Text
 		r[fieldCheckStatusMessageTemplate] = base.StatusMessageTemplate
-		assignFluxDur(fieldCheckEvery, base.Every)
-		assignFluxDur(fieldCheckOffset, base.Offset)
+		assignFluxDur(fieldEvery, base.Every)
+		assignFluxDur(fieldOffset, base.Offset)
 		var tags []Resource
 		for _, t := range base.Tags {
 			if t.Valid() != nil {
@@ -112,7 +112,7 @@ func checkToResource(ch influxdb.Check, name string) Resource {
 		assignBase(cT.Base)
 		assignFluxDur(fieldCheckTimeSince, cT.TimeSince)
 		assignFluxDur(fieldCheckStaleTime, cT.StaleTime)
-		r[fieldCheckLevel] = cT.Level.String()
+		r[fieldLevel] = cT.Level.String()
 		assignNonZeroBools(r, map[string]bool{fieldCheckReportZero: cT.ReportZero})
 	case *icheck.Threshold:
 		r[fieldKind] = KindCheckThreshold.title()
@@ -127,7 +127,7 @@ func checkToResource(ch influxdb.Check, name string) Resource {
 }
 
 func convertThreshold(th icheck.ThresholdConfig) Resource {
-	r := Resource{fieldCheckLevel: th.GetLevel().String()}
+	r := Resource{fieldLevel: th.GetLevel().String()}
 
 	switch realType := th.(type) {
 	case icheck.Lesser: