Merge pull request #32 from dalen/puppetdb3

Add PuppetDB 3 support

app/config.js.example

@@ -27,17 +27,17 @@ DASHBOARD_PANELS = [
   {
     name: 'Unresponsive nodes',
     type: 'danger',
-    query: '#node.report-timestamp < @"now - 2 hours"'
+    query: '#node.report_timestamp < @"now - 2 hours"'
   },
   {
     name: 'Nodes in production env',
     type: 'success',
-    query: '#node.catalog-environment = production'
+    query: '#node.catalog_environment = production'
   },
   {
     name: 'Nodes in non-production env',
     type: 'warning',
-    query: '#node.catalog-environment != production'
+    query: '#node.catalog_environment != production'
   }
 ];
 

app/controllers/dashboard/dashboard.coffee

@@ -23,9 +23,9 @@ angular.module('app').controller 'DashboardCtrl', class
     @$scope.panelWidth = Math.max(2, Math.floor(12 / @$scope.panels.length))
     @checkVersion()
 
-  getBean: (name, scopeName, multiply = 1, bean = 'com.puppetlabs.puppetdb.query.population') ->
+  getBean: (name, scopeName, multiply = 1, bean = 'puppetlabs.puppetdb.query.population') ->
     @$scope[scopeName] = undefined
-    @PuppetDB.query("metrics/mbean/#{bean}:type=default,name=#{name}")
+    @PuppetDB.getBean("#{bean}:type=default,name=#{name}")
       .success (data) =>
         @$scope[scopeName] = (angular.fromJson(data).Value * multiply)
           .toLocaleString()
@@ -49,11 +49,11 @@ angular.module('app').controller 'DashboardCtrl', class
     @$location.path "/nodes"
 
   checkVersion: () ->
-    @PuppetDB.query("version")
+    @PuppetDB.getVersion()
       .success (data) ->
         major = parseInt(data.version.split('.')[0], 10)
         minor = parseInt(data.version.split('.')[1], 10)
         patch = parseInt(data.version.split('.')[2], 10)
-        unless major >= 2 and minor >= 2
-          throw new Error("This version of Puppet Explorer requires PuppetDB version 2.2.0" +
+        unless major >= 3
+          throw new Error("This version of Puppet Explorer requires PuppetDB version 3.0.0+" +
             ", you are running PuppetDB #{data.version}")

app/controllers/dashboard/dashboard.tpl.html

@@ -59,12 +59,12 @@ <h3>Syntax</h3>
        For example <code>@"now - 2 hours"</code>.</p>
 
     <p>A <code>#</code> sign can be used to do a subquery, against the nodes endpoint for example to
-       query the <code>report-timestamp</code>, <code>catalog-timestamp</code> or <code>facts-timestamp</code>
-       fields. For example <code>#node.report-timestamp < @"now - 2 hours"</code>.</p>
+       query the <code>report_timestamp</code>, <code>catalog_timestamp</code> or <code>facts_timestamp</code>
+       fields. For example <code>#node.report_timestamp < @"now - 2 hours"</code>.</p>
 
     <p>A subquery using the <code>#</code> sign can have a block of expressions instead of a single
-       expression. For example <code>#node { report-timestamp > @"now - 4 hours" and
-       report-timestamp < @"now - 2 hours" }</code></p>
+       expression. For example <code>#node { report_timestamp > @"now - 4 hours" and
+       report_timestamp < @"now - 2 hours" }</code></p>
 
     <p>A bare string without comparison operator will be treated as a regexp match against the certname.</p>
   </div>
@@ -108,7 +108,7 @@ <h3>Query Examples</h3>
     </div>
     Nodes that haven't reported in the last 2 hours
     <div class="well well-sm">
-        <tt>#node.report-timestamp<@"now - 2 hours"</tt>
+        <tt>#node.report_timestamp<@"now - 2 hours"</tt>
     </div>
   </div>
 </div>

app/controllers/events/events.coffee

@@ -48,7 +48,7 @@ angular.module("app").controller "EventsCtrl", class
   createEventQuery: (exclude = false) ->
     query = ["and"]
     if @mode.current == 'latest'
-      query.push ["=", "latest-report?", true]
+      query.push ["=", "latest_report?", true]
     else if @mode.current == 'report'
       query.push ["=", "report", @$scope.reportHash]
     else
@@ -60,9 +60,9 @@ angular.module("app").controller "EventsCtrl", class
       cc = @$location.search().containing_class
       if cc is 'none'
         cc = null
-      query.push([ "=", "containing-class", cc])
+      query.push([ "=", "containing_class", cc])
     if @$location.search().resource_type? and exclude != 'resource_type'
-      query.push([ "=", "resource-type", @$location.search().resource_type])
+      query.push([ "=", "resource_type", @$location.search().resource_type])
     if @$location.search().status? and exclude != 'status'
       query.push([ "=", "status", @$location.search().status.toLowerCase()])
 
@@ -80,7 +80,7 @@ angular.module("app").controller "EventsCtrl", class
       {
         offset: @$scope.perPage * ((@$location.search().page || 1) - 1)
         limit: @$scope.perPage
-        "order-by": angular.toJson([ field: "timestamp", order: "desc" ]),
+        order_by: angular.toJson([ field: "timestamp", order: "desc" ]),
       }
       (data, total) =>
         @$scope.numItems = total
@@ -101,7 +101,7 @@ angular.module("app").controller "EventsCtrl", class
       @$location.search().query
       @createEventQuery('containing_class')
       {
-        'summarize-by': 'containing-class'
+        summarize_by: 'containing_class'
       }
       (data, total) =>
         chartData = []
@@ -118,7 +118,7 @@ angular.module("app").controller "EventsCtrl", class
       @$location.search().query
       @createEventQuery('resource_type')
       {
-        'summarize-by': 'resource'
+        summarize_by: 'resource'
       }
       (data, total) =>
         chartData = []
@@ -137,7 +137,7 @@ angular.module("app").controller "EventsCtrl", class
       @$location.search().query
       @createEventQuery('status')
       {
-        'summarize-by': 'resource'
+        summarize_by: 'resource'
       }
       (data, total) =>
         chartData = [

app/controllers/events/events.tpl.html

@@ -82,12 +82,12 @@ <h3 class="panel-title">Event status</h3>
   </tr></thead>
   <tbody ng-repeat="event in events.events">
     <tr ng-class="events.color(event.status)" ng-click="events.toggleRow(event)">
-      <td>{{event["certname"]}}</td>
-      <td>{{event["resource-type"]}}</td>
-      <td>{{event["resource-title"]}}</td>
-      <td>{{event["property"]}}</td>
-      <td>{{event["old-value"]}}</td>
-      <td>{{event["new-value"]}}</td>
+      <td>{{event.certname}}</td>
+      <td>{{event.resource_type}}</td>
+      <td>{{event.resource_title}}</td>
+      <td>{{event.property}}</td>
+      <td>{{event.old_value}}</td>
+      <td>{{event.new_value}}</td>
     </tr>
     <tr>
       <td class="reveal-animation" ng-if="event.show" colspan="6">
@@ -98,13 +98,13 @@ <h3 class="panel-title">Event status</h3>
           </tr>
           <tr>
             <th>Containing-class</th>
-            <td>{{event["containing-class"]}}</td>
+            <td>{{event.containing_class}}</td>
           </tr>
           <tr>
             <th>Containment-path</th>
             <td>
               <ol class="breadcrumb">
-                <li ng-repeat="container in event['containment-path']">{{container}}</li>
+                <li ng-repeat="container in event.containment_path">{{container}}</li>
               </ol>
             </td>
           </tr>
@@ -114,7 +114,7 @@ <h3 class="panel-title">Event status</h3>
           </tr>
           <tr>
             <th>Timestamp</th>
-            <td title="{{event['timestamp']}}" am-time-ago="event['timestamp']"></td>
+            <td title="{{event.timestamp}}" am-time-ago="event.timestamp"></td>
           </tr>
           <tr ng-click="events.selectReport(event.report)">
             <th>Report</th>

app/controllers/facts/facts.coffee

@@ -65,7 +65,7 @@ angular.module("app").controller "FactsCtrl", class
   #
   # Returns: `undefined`
   getFactNames: ->
-    @PuppetDB.query("fact-paths", { "order-by": angular.toJson([ field: "path", order: "asc" ]) })
+    @PuppetDB.query("fact-paths", { order_by: angular.toJson([ field: "path", order: "asc" ]) })
     .success (data, status, headers, config) =>
       @factPaths = (fact.path for fact in angular.fromJson(data) when fact.path[0][0] isnt '_')
     .error (data, status, headers, config) ->

app/controllers/nodedetail/nodedetail.coffee

@@ -20,9 +20,9 @@ angular.module("app").controller "NodeDetailCtrl", class
       @$location.search().query
       ["=", "certname", @node]
       {
-        'order-by': angular.toJson([field: "end-time", order: "desc"])
-        'offset': @$scope.perPage * ((@$location.search().page || 1) - 1)
-        'limit': @$scope.perPage
+        order_by: angular.toJson([field: "end_time", order: "desc"])
+        offset: @$scope.perPage * ((@$location.search().page || 1) - 1)
+        limit: @$scope.perPage
       }
       (data, total) =>
         @reports = data
@@ -33,7 +33,7 @@ angular.module("app").controller "NodeDetailCtrl", class
             null
             ["=", "report", report.hash]
             {
-              'summarize-by': 'certname'
+              'summarize_by': 'certname'
             }
             (data, total) ->
               report.events = data[0]
@@ -48,7 +48,7 @@ angular.module("app").controller "NodeDetailCtrl", class
       "fact-contents"
       null
       ["=", "certname", @node]
-      { 'order-by': angular.toJson([field: "name", order: "asc"]) }
+      { order_by: angular.toJson([field: "name", order: "asc"]) }
       (data, total) =>
         @facts = data.filter((fact) ->
           fact.name[0] isnt '_'

app/controllers/nodedetail/nodedetail.tpl.html

@@ -19,8 +19,8 @@ <h3>{{nodeDetail.node}}</h3>
         </tr></thead>
         <tbody>
           <tr ng-repeat="report in nodeDetail.reports" ng-click="nodeDetail.selectReport(report.hash)">
-            <td title="{{report['end-time']}}">
-              <span am-time-ago="report['end-time']"></span>
+            <td title="{{report.end_time}}">
+              <span am-time-ago="report.end_time"></span>
             </td>
             <td class="text-center">{{report.events.successes || ""}}</td>
             <td class="text-center">{{report.events.noops || ""}}</td>

app/controllers/nodelist/nodelist.coffee

@@ -24,7 +24,7 @@ angular.module("app").controller "NodeListCtrl", class
       {
         offset: @$scope.perPage * ((@$location.search().page || 1) - 1)
         limit: @$scope.perPage
-        "order-by": angular.toJson([field: "certname", order: "asc"])
+        order_by: angular.toJson([field: "certname", order: "asc"])
       }
       (data, total) =>
         @$scope.numItems = total
@@ -45,10 +45,10 @@ angular.module("app").controller "NodeListCtrl", class
     @PuppetDB.parseAndQuery(
       "event-counts"
       null
-      ["and", ["=", "certname", node.certname], ["=", "latest-report?", true]]
+      ["and", ["=", "certname", node.certname], ["=", "latest_report?", true]]
       {
-        'summarize-by': 'certname'
-        'order-by': angular.toJson([field: "certname", order: "asc"])
+        summarize_by: 'certname'
+        order_by: angular.toJson([field: "certname", order: "asc"])
       }
       do (node) ->
         (data, total) ->
@@ -73,8 +73,8 @@ angular.module("app").controller "NodeListCtrl", class
       null
       ["=", "certname", node.certname]
       {
-        'order-by': angular.toJson([field: "receive-time", order: "desc"])
-        'limit': 1
+        order_by: angular.toJson([field: "receive_time", order: "desc"])
+        limit: 1
       }
       do (node) ->
         (data, total) ->
@@ -120,9 +120,9 @@ angular.module("app").controller "NodeListCtrl", class
 
   # Return if a node is unresponsive or not
   nodeUnresponsive: (node) ->
-    return true unless node['report-timestamp']?
+    return true unless node.report_timestamp?
     if UNRESPONSIVE_HOURS?
       hours = UNRESPONSIVE_HOURS
     else
       hours = 2
-    return moment(node['report-timestamp']).isBefore(moment.utc().subtract(hours,'hours'))
+    return moment(node.report_timestamp).isBefore(moment.utc().subtract(hours,'hours'))

app/controllers/nodelist/nodelist.tpl.html

@@ -17,7 +17,7 @@
       <td ng-click="nodeList.selectNode(node)">{{node.certname}}</td>
       <td title="{{node['catalog-timestamp']}}">
         <span class="glyphicon glyphicon-warning-sign text-warning" ng-if="nodeList.nodeUnresponsive(node)"></span>
-        <span am-time-ago="node['report-timestamp']"></span>
+        <span am-time-ago="node.report_timestamp"></span>
       </td>
       <td class="text-center">{{node.events.successes || ""}}</td>
       <td class="text-center">{{node.events.noops || ""}}</td>

app/services/puppetdb/puppetdb.coffee

@@ -61,7 +61,7 @@ angular.module('app').factory 'PuppetDB', ($http,
       config = @serverConfig()
       config.params = params
       config.timeout = @canceller.promise
-      $http.get("#{@serverUrl()}/#{@apiVersion}/#{endpoint}", config)
+      $http.get("#{@serverUrl()}/pdb/query/#{@apiVersion}/#{endpoint}", config)
 
     # Public: Combined function to both parse and query PuppetDB.
     #
@@ -92,7 +92,7 @@ angular.module('app').factory 'PuppetDB', ($http,
 
       params.query = angular.toJson(query)
       if endpoint in ['nodes', 'reports', 'events', 'facts']
-        params['include-total'] = true
+        params['include_total'] = true
 
       # Start querying
       @query(endpoint, params)
@@ -104,3 +104,21 @@ angular.module('app').factory 'PuppetDB', ($http,
     cancel: =>
       @canceller.resolve("user cancelled")
       @canceller = $q.defer()
+
+    # Public: Get a bean value, returns a promise just like $http
+    #
+    # name - The {String} bean name
+    #
+    # Returns: A promise from $http
+    getBean: (name) ->
+      config = @serverConfig()
+      config.timeout = @canceller.promise
+      $http.get("#{@serverUrl()}/metrics/v1/mbeans/#{name}", config)
+
+    # Public: Get PuppetDB version, returns a promise just like $http
+    #
+    # Returns: A promise from $http
+    getVersion: ->
+      config = @serverConfig()
+      config.timeout = @canceller.promise
+      $http.get("#{@serverUrl()}/pdb/meta/v1/version", config)