Merge branch 'librato-alerts' of https://github.com/elblivion/terraform…

… into elblivion-librato-alerts
hashicorp · Aug 31, 2016 · a6c55dd · a6c55dd
2 parents b891f6f + e4af2d5
commit a6c55dd
Show file tree

Hide file tree

Showing 14 changed files with 1,553 additions and 3 deletions.
diff --git a/builtin/providers/librato/provider.go b/builtin/providers/librato/provider.go
@@ -28,6 +28,8 @@ func Provider() terraform.ResourceProvider {
 		ResourcesMap: map[string]*schema.Resource{
 			"librato_space":       resourceLibratoSpace(),
 			"librato_space_chart": resourceLibratoSpaceChart(),
+			"librato_alert":       resourceLibratoAlert(),
+			"librato_service":     resourceLibratoService(),
 		},
 
 		ConfigureFunc: providerConfigure,