diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index fa670a1..0000000 --- a/.jshintrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "camelcase": false, - "curly": true, - "eqeqeq": true, - "indent": 2, - "strict": true, - "trailing": true -} \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index 3eb6ec5..689c296 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,15 @@ -[0.5.1] +# 0.7.0 +## Features / Enhancements +- Add support for bearer token in export/import of dashboard +- Document API key usage -New Features: -- Store/Upload/Download dashboards in S3. +## Bug fixes +- Updated vulnerable dependencies +- Fix missing folder in local dashboard summarize +- Fix logging causing an exception in case of missing response -Breaking Changes: -- `wizzy export new-dashboard` is changed to `wizzy export dashboard`. -- `wizzy datasource` commands are using names now instead of ids. \ No newline at end of file +## Breaking changes +- Now requires at least Node 8 + +## Know bugs +- Local commands are still broken \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 968f66a..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -module.exports = function(grunt) { - - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - jshint: { - all: ['Gruntfile.js', 'src/**/*.js'], - options: { - jshintrc: '.jshintrc', - verbose: true, - } - } - }); - - // Load the plugin. - grunt.loadNpmTasks('grunt-contrib-jshint'); - - // Default task(s). - grunt.registerTask('default', 'jshint'); - -}; diff --git a/package-lock.json b/package-lock.json index 87649b8..5bcfc0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wizzy", - "version": "0.6.0", + "version": "0.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2018,6 +2018,18 @@ } } }, + "handlebars": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.2.tgz", + "integrity": "sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==", + "dev": true, + "requires": { + "neo-async": "^2.6.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + } + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -2580,44 +2592,6 @@ "dev": true, "requires": { "handlebars": "^4.1.2" - }, - "dependencies": { - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "dev": true, - "optional": true - }, - "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "dev": true, - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", - "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - } - } } }, "jmespath": { @@ -4211,6 +4185,12 @@ } } }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, "spawn-wrap": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz", @@ -4665,6 +4645,26 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "uglify-js": { + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", + "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", + "dev": true, + "optional": true, + "requires": { + "commander": "~2.20.3", + "source-map": "~0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "optional": true + } + } + }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", diff --git a/package.json b/package.json index 1edbc70..59ea8b8 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,16 @@ { "name": "wizzy", - "version": "0.6.0", + "version": "0.7.0", "description": "Lets you automate Grafana interaction", "main": "index.js", "scripts": { + "lint": "eslint --ext .js .", "test": "nyc --reporter=html --reporter=text mocha --recursive", "coverage": "nyc report --reporter=text-lcov | coveralls" }, "repository": { "type": "git", - "url": "git+https://github.com/utkarshcmu/wizzy.git" + "url": "git+https://github.com/grafana-wizzy/wizzy.git" }, "keywords": [ "Grafana" @@ -17,9 +18,9 @@ "author": "Utkarsh Bhatnagar (https://github.com/utkarshcmu)", "license": "Apache-2.0", "bugs": { - "url": "https://github.com/utkarshcmu/wizzy/issues" + "url": "https://github.com/grafana-wizzy/wizzy/issues" }, - "homepage": "https://github.com/utkarshcmu/wizzy#readme", + "homepage": "https://github.com/grafana-wizzy/wizzy", "bin": { "wizzy": "src/index.js" },