hubot-grafana 3.0.1 → 3.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hubot-grafana",
   "description": "Query Grafana dashboards",
-  "version": "3.0.1",
+  "version": "3.1.2",
   "author": "Stephen Yeargin <stephen@yearg.in>",
   "license": "MIT",
   "keywords": [
@@ -25,16 +25,15 @@
     "hubot": "^3"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "coffee-script": "^1.12.7",
     "hubot-test-helper": "^1.9.0",
-    "husky": "^6.0.0",
-    "matchdep": "^2.0.0",
-    "mocha": "^9.0.1",
-    "nock": "^13.1.0",
-    "release-it": "^14.10.0",
+    "husky": "^7.0.4",
+    "mocha": "^9.2.2",
+    "nock": "^13.2.4",
+    "release-it": "^14.13.1",
     "require-dir": "^1.2.0",
-    "sinon": "^11.1.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "travis-cov": "^0.2.5"
   },

package/src/grafana.coffee

@@ -228,6 +228,7 @@ module.exports = (robot) ->
 
       # Return dashboard rows
       panelNumber = 0
+      returnedCount = 0
       for row in data.rows
         for panel in row.panels
           robot.logger.debug panel
@@ -245,6 +246,10 @@ module.exports = (robot) ->
           if pname && panel.title.toLowerCase().indexOf(pname) is -1
             continue
 
+          # Skip if we have already returned max count of dashboards
+          if returnedCount > max_return_dashboards
+            continue
+
           # Build links for message sending
           title = formatTitleWithTemplate(panel.title, template_map)
           uid = dashboard.dashboard.uid
@@ -255,8 +260,11 @@ module.exports = (robot) ->
             imageUrl += "&orgId=#{encodeURIComponent query.orgId}"
           link = "#{endpoint.host}/d/#{uid}/?panelId=#{panel.id}&fullscreen&from=#{timespan.from}&to=#{timespan.to}#{variables}"
 
-          return sendDashboardChart msg, title, imageUrl, link
-      return sendError "Could not locate desired panel.", msg
+          sendDashboardChart msg, title, imageUrl, link
+          returnedCount += 1
+
+      if returnedCount == 0
+        return sendError "Could not locate desired panel.", msg
 
   # Process the bot response
   sendDashboardChart = (msg, title, imageUrl, link) ->

package/test/grafana-s3-test.coffee

@@ -21,20 +21,13 @@ describe 's3', ->
     nock('https://play.grafana.org')
       .get('/api/dashboards/uid/AAy9r_bmk')
       .replyWithFile(200, __dirname + '/fixtures/v8/dashboard-monitoring-default.json')
-    nock('https://play.grafana.org')
-      .defaultReplyHeaders({
-        'Content-Type': 'image/png'
-      })
-      .get('/render/d-solo/AAy9r_bmk/')
-      .query(
-        panelId: 3,
-        width: 1000,
-        height: 500,
-        from: 'now-6h',
-        to: 'now',
-        "var-server": 'ww3.example.com'
-      )
-      .replyWithFile(200, __dirname + '/fixtures/v8/dashboard-monitoring-default.png')
+
+    for i in [3,7,8]
+      nock('https://play.grafana.org')
+        .defaultReplyHeaders({ 'Content-Type': 'image/png' })
+        .get('/render/d-solo/AAy9r_bmk/')
+        .query({ panelId: i, width: 1000, height: 500, from: 'now-6h', to: 'now', "var-server": 'ww3.example.com' })
+        .replyWithFile(200, __dirname + '/fixtures/v8/dashboard-monitoring-default.png')
 
   afterEach ->
     @room.destroy()
@@ -50,6 +43,7 @@ describe 's3', ->
       nock('https://graf.s3.amazonaws.com')
         .filteringPath(/[a-z0-9]+\.png/g, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
         .put('/grafana/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
+        .times(3)
         .reply(200)
 
     it 'should respond with a png graph in the default s3 region', (done) ->
@@ -77,6 +71,7 @@ describe 's3', ->
       nock('https://graf.custom.s3.endpoint.com')
         .filteringPath(/[a-z0-9]+\.png/g, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
         .put('/grafana/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
+        .times(3)
         .reply(200)
 
     after ->
@@ -107,6 +102,7 @@ describe 's3', ->
       nock('https://s3.amazonaws.com')
         .filteringPath(/[a-z0-9]+\.png/g, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
         .put('/graf/grafana/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.png')
+        .times(3)
         .reply(200)
 
     after ->

package/test/grafana-v8-test.coffee

@@ -91,6 +91,11 @@ describe 'grafana v8', ->
       expect(room.messages).to.eql [
         [ 'alice', 'hubot graf db 97PlYC7Mk' ]
         [ 'hubot', "Grafana diagram architecture: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=13&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=13&fullscreen&from=now-6h&to=now"]
+        [ 'hubot', 'server requests: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=2&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=2&fullscreen&from=now-6h&to=now' ]
+        [ 'hubot', 'client side full page load: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=5&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=5&fullscreen&from=now-6h&to=now' ]
+        [ 'hubot', 'Memory / CPU: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=4&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=4&fullscreen&from=now-6h&to=now' ]
+        [ 'hubot', 'Traffic In/Out: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=11&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=11&fullscreen&from=now-6h&to=now' ]
+        [ 'hubot', 'logins: https://play.grafana.org/render/d-solo/97PlYC7Mk/?panelId=3&width=1000&height=500&from=now-6h&to=now - https://play.grafana.org/d/97PlYC7Mk/?panelId=3&fullscreen&from=now-6h&to=now' ]
       ]
 
   context 'ask hubot to return a panel by slug', ->