Updated actions and jobs definitions

README.md

@@ -72,29 +72,41 @@ curator::job { 'purge_logstash_over_45_days_everyday':
 
 You can also directly use hiera in order to manage your resources :
 
+- Include those additionnal classes in Puppet
+
+```puppet
+
+include ::curator::actions
+include ::curator::jobs
+
+```
+
+- And then in Hiera :
+
 ```yaml
 
-curator::actions:
+curator::actions::values:
   'purge_logstash_over_45_days':
-    1:
-      action: delete_indices
-      description: Delete indices older than 45 days (based on index name)
-      options:
-        continue_if_exception: 'True'
-        disable_action: 'False'
-        ignore_empty_list: 'True'
-      filters:
-        - filtertype: pattern
-          kind: prefix
-          value: logstash-
-        - filtertype: age
-          source: name
-          direction: older
-          timestring: '%Y.%m.%d'
-          unit: days
-          unit_count: '45'
-
-curator::jobs:
+    entities:
+      1:
+        action: delete_indices
+        description: Delete indices older than 45 days (based on index name)
+        options:
+          continue_if_exception: 'True'
+          disable_action: 'False'
+          ignore_empty_list: 'True'
+        filters:
+          - filtertype: pattern
+            kind: prefix
+            value: logstash-
+          - filtertype: age
+            source: name
+            direction: older
+            timestring: '%Y.%m.%d'
+            unit: days
+            unit_count: '45'
+
+curator::jobs::values:
   'purge_logstash_over_45_days_everyday':
     action: 'purge_logstash_over_45_days'
     minute: '0'

manifests/actions.pp

@@ -0,0 +1,14 @@
+# == Class: curator::actions
+#
+# Creates action resources from a given hash
+#
+# === Parameters
+#
+class curator::actions (
+  Hash $values = {},
+) {
+  require curator
+  require curator::config
+
+  create_resources( curator::action, $values )
+}

manifests/jobs.pp

@@ -0,0 +1,14 @@
+# == Class: curator::jobs
+#
+# Creates job resources from a given hash
+#
+# === Parameters
+#
+class curator::jobs (
+  Hash $values = {},
+) {
+  require curator
+  require curator::config
+
+  create_resources( curator::job, $values )
+}

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "mvisonneau-curator",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Maxime VISONNEAU",
   "summary": "Installs, configures, and manages Elasticsearch Curator.",
   "license": "Apache-2.0",