diff --git a/source/app/action/index.mjs b/source/app/action/index.mjs index 01a31e3b..e89f62da 100644 --- a/source/app/action/index.mjs +++ b/source/app/action/index.mjs @@ -8,8 +8,8 @@ import paths from "path" import sgit from "simple-git" import mocks from "../../../tests/mocks/index.mjs" import metrics from "../metrics/index.mjs" -import setup from "../metrics/setup.mjs" import presets from "../metrics/presets.mjs" +import setup from "../metrics/setup.mjs" process.on("unhandledRejection", error => { throw error }) diff --git a/source/app/metrics/metadata.mjs b/source/app/metrics/metadata.mjs index c71ba033..d593835e 100644 --- a/source/app/metrics/metadata.mjs +++ b/source/app/metrics/metadata.mjs @@ -228,7 +228,12 @@ metadata.plugin = async function({__plugins, __templates, name, logger}) { key, { comment:comments[key] ?? `# ${value.description}`, - descriptor:yaml.dump({[key]:Object.fromEntries(Object.entries(value).filter(([key]) => ["description", "default", "required"].includes(key)).map(([k, v]) => k === "description" ? [k, v.split("\n")[0]] : k === "default" ? [k, /^\$\{\{[\s\S]+\}\}$/.test(v) ? v : ""] : [k, v]))}, {quotingType:'"', noCompatMode:true}), + descriptor:yaml.dump({ + [key]:Object.fromEntries( + Object.entries(value).filter(([key]) => ["description", "default", "required"].includes(key)).map(([k, v]) => k === "description" ? [k, v.split("\n")[0]] : k === "default" ? [k, /^\$\{\{[\s\S]+\}\}$/.test(v) ? v : ""] : [k, v] + ), + ), + }, {quotingType:'"', noCompatMode:true}), }, ]), ) @@ -250,7 +255,7 @@ metadata.plugin = async function({__plugins, __templates, name, logger}) { } const unspecified = value === "" //From presets - if ((key in preset)&&(unspecified)) { + if ((key in preset) && (unspecified)) { console.debug(`metrics/inputs > ${key} has been set by preset value`) q[key] = preset[key] }