Merge pull request #48 from maier/master

v2.5.0
circonus-labs · Feb 1, 2018 · f6538e8 · f6538e8
2 parents 2739073 + 907e9bd
commit f6538e8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/provision/cosi-site.yml b/provision/cosi-site.yml
@@ -2,7 +2,7 @@
 - hosts: all
   vars:
     # update when src/package.json version bumped and ready for release
-    cosi_site_version: "2.4.4"
+    cosi_site_version: "2.5.0"
     # note, **just** the file name, not a "path" the specified file is expected
     # to be in ./content/files relative to cosi-site.js
     installer_rpm_file: "cosi-{{ cosi_site_version }}-1.noarch.rpm"

diff --git a/src/CHAGNELOG.md b/src/CHAGNELOG.md
@@ -1,3 +1,8 @@
+### 2.5.0 2018-02-01
+
+* Revise legend_formulas
+* update template regex to support backtick and dash in plugin names w/subgroups (e.g. process_memory)
+
 ### 2.4.4 2018-01-26
 
 * fix JSON in dashboard template

diff --git a/src/lib/validators/index.js b/src/lib/validators/index.js
@@ -192,7 +192,7 @@ class Validators {
             errors.push(`Invalid template category '${req.params.t_cat}'`);
         }
 
-        if (!req.params.t_name.match(/^[a-z0-9_]+$/i)) {
+        if (!req.params.t_name.match(/^[a-z0-9-_`]+$/i)) {
             errors.push(`Invalid template name '${req.params.t_name}'`);
         }
 

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosi-site",
-  "version": "2.4.4",
+  "version": "2.5.0",
   "private": true,
   "license": "SEE LICENSE IN LICENSE",
   "description": "Circonus One Step Install registration API",

diff --git a/src/util/package.json b/src/util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosi-cli",
-  "version": "2.4.4",
+  "version": "2.5.0",
   "description": "Circonus One Step Install utility",
   "private": true,
   "author": "matt maier (https://github.com/maier)",