diff --git a/.gitignore b/.gitignore index 5e56e040..a5f8941e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /bin +/dark-web-extension/*.wasm +/dark-web-extension/web-ext-artifacts diff --git a/cmd/wasm/main.go b/cmd/wasm/main.go new file mode 100644 index 00000000..cf8e7339 --- /dev/null +++ b/cmd/wasm/main.go @@ -0,0 +1,42 @@ +//go:build js && wasm + +package main + +import ( + "strings" + "syscall/js" + + "github.com/K-Phoen/dark/internal/pkg/converter" + "go.uber.org/zap" +) + +func dashboardToDarkFunc() js.Func { + return js.FuncOf(func(this js.Value, args []js.Value) interface{} { + if len(args) != 1 { + return "invalid nnumber of arguments passed" + } + + logger := zap.NewNop() + conv := converter.NewJSON(logger) + + inputJSON := args[0].String() + output := &strings.Builder{} + + if err := conv.ToK8SManifest(strings.NewReader(inputJSON), output, converter.K8SManifestOptions{ + Folder: "folder_name", + Name: "name", + Namespace: "default", + }); err != nil { + logger.Fatal("Could not convert dashboard", zap.Error(err)) + } + + return output.String() + }) +} + +func main() { + js.Global().Set("dashboardToDark", dashboardToDarkFunc()) + + c := make(chan struct{}, 0) + <-c +} diff --git a/dark-web-extension/README.md b/dark-web-extension/README.md new file mode 100644 index 00000000..6f00a731 --- /dev/null +++ b/dark-web-extension/README.md @@ -0,0 +1,37 @@ +# DARK web extension + +Browser extension to convert Grafana dashboards into an equivalent DARK YAML file. + +Whenever a Grafana dashboard is viewed, the extension will add an export button to the dashboard's toolbar. + +**Note:** only tested with Firefox. + +## Building + +### Compile the `./cmd/wasm` binary to WebAssembly + +The extension re-uses the conversion logic written in Go, thanks to WebAssembly. + +A binary specific to this use-case is bundled within the repository, and needs to be compiled for the extension to run: + +```sh +GOOS=js GOARCH=wasm go build -o dark-web-extension/dark.wasm ./cmd/wasm +``` + +### `./dark-web-extension/wasm_exec.js` file + +Distributed with Go: + +```sh +cp "$(go env GOROOT)/misc/wasm/wasm_exec.js" ./dark-web-extension +``` + +### Building the extension + +```sh +npm install --global web-ext +cd ./dark-web-extension/ +web-ext build +``` + +The extension can then be installing from the file generated by `web-ext`: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension#installing diff --git a/dark-web-extension/background_script.js b/dark-web-extension/background_script.js new file mode 100644 index 00000000..58d9ecb7 --- /dev/null +++ b/dark-web-extension/background_script.js @@ -0,0 +1,41 @@ +// Put all the javascript code here, that you want to execute in background. + +console.debug("starting background worker"); + +browser.runtime.onMessage.addListener(handleMessage); + +function handleMessage(request, _sender, sendResponse) { + console.info(`content script sent a message`, request); + + if (request.action === 'convert-to-k8s') { + convertToK8s(request.data.model).then(result => { + const blob = new Blob([result], {type: 'text/yaml'}); + + browser.downloads.download({ + url: window.URL.createObjectURL(blob), + filename: 'dark-dashboard.yaml', + conflictAction: 'uniquify', + }); + + sendResponse({ + success: true, + result: result, + }); + }); + } + + return true; +} + +async function convertToK8s(dashboardModel) { + const go = new Go(); + + return WebAssembly.instantiateStreaming( + fetch(browser.runtime.getURL("dark.wasm")), + go.importObject, + ).then(result => { + go.run(result.instance); + + return dashboardToDark(dashboardModel); + }); +} diff --git a/dark-web-extension/content_script.js b/dark-web-extension/content_script.js new file mode 100644 index 00000000..d03feb4c --- /dev/null +++ b/dark-web-extension/content_script.js @@ -0,0 +1,101 @@ +// Put all the javascript code here, that you want to execute after page load. +if (isGrafana()) { + console.debug("content_script bootstrap"); + + // hackish way of giving enough time for grafana to load the dashboard + waitForElm('.page-toolbar').then(() => { + console.debug('page-toolbar found, inserting DARK export button'); + setupExportButton(); + }); +} + +function setupExportButton() { + const buttonsContainer = document.querySelector('.page-toolbar > div:last-child'); + + if (buttonsContainer.length === 0) { + console.debug("buttons container not found"); + return; + } + + console.debug("appending export button"); + const lastButton = buttonsContainer.childNodes[buttonsContainer.childNodes.length - 1]; + const darkExportButton = lastButton.cloneNode(true); + darkExportButton.onclick = triggerExport; + darkExportButton.title = 'Export as DARK dashboard'; + + const darkExportButtonSVG = darkExportButton.querySelector('svg'); + darkExportButtonSVG.innerHTML = ` + + + + +`; + + buttonsContainer.appendChild(darkExportButton); +} + +function triggerExport() { + const dashboardUID = getDashboardUID(); + + if (!dashboardUID) { + console.warn('could not infer dashboard UID'); + return; + } + + console.debug("exporting dashboard with UID", dashboardUID); + + fetch(`${window.location.origin}/api/dashboards/uid/${dashboardUID}`) + .then(response => response.json()) + .then(apiResponse => convertGrafanaDashboard(apiResponse.dashboard)) + .then(response => console.debug('response', response)) + .catch(error => { + console.error(`Error: ${error}`); + }) +} + +function getDashboardUID() { + const pagePath = window.location.pathname; + + return pagePath.split('/')[2]; +} + +function convertGrafanaDashboard(model) { + return browser.runtime.sendMessage({ + action: "convert-to-k8s", + data: { + model: JSON.stringify(model), + }, + }); +} + +function isGrafana() { + return document.body.classList.contains('app-grafana'); +} + +function waitForElm(selector) { + return new Promise(resolve => { + if (document.querySelector(selector)) { + return resolve(document.querySelector(selector)); + } + + const observer = new MutationObserver(() => { + if (document.querySelector(selector)) { + resolve(document.querySelector(selector)); + observer.disconnect(); + } + }); + + observer.observe(document.body, { + childList: true, + subtree: true + }); + }); +} diff --git a/dark-web-extension/icons/icon.png b/dark-web-extension/icons/icon.png new file mode 100644 index 00000000..063cfa8f Binary files /dev/null and b/dark-web-extension/icons/icon.png differ diff --git a/dark-web-extension/manifest.json b/dark-web-extension/manifest.json new file mode 100644 index 00000000..f53456bb --- /dev/null +++ b/dark-web-extension/manifest.json @@ -0,0 +1,31 @@ +{ + "manifest_version": 2, + "name": "dark", + "description": "Converts Grafana dashboards into an equivalent DARK YAML file", + "version": "0.0.1", + "icons": { + "64": "icons/icon.png" + }, + + "permissions": [ + "downloads" + ], + + "background": { + "scripts": [ + "wasm_exec.js", + "background_script.js" + ] + }, + "content_scripts": [ + { + "matches": [ + "http://*/*", + "https://*/*" + ], + "js": [ + "content_script.js" + ] + } + ] +} diff --git a/dark-web-extension/wasm_exec.js b/dark-web-extension/wasm_exec.js new file mode 100644 index 00000000..e6c89210 --- /dev/null +++ b/dark-web-extension/wasm_exec.js @@ -0,0 +1,554 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +"use strict"; + +(() => { + const enosys = () => { + const err = new Error("not implemented"); + err.code = "ENOSYS"; + return err; + }; + + if (!globalThis.fs) { + let outputBuf = ""; + globalThis.fs = { + constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, // unused + writeSync(fd, buf) { + outputBuf += decoder.decode(buf); + const nl = outputBuf.lastIndexOf("\n"); + if (nl != -1) { + console.log(outputBuf.substring(0, nl)); + outputBuf = outputBuf.substring(nl + 1); + } + return buf.length; + }, + write(fd, buf, offset, length, position, callback) { + if (offset !== 0 || length !== buf.length || position !== null) { + callback(enosys()); + return; + } + const n = this.writeSync(fd, buf); + callback(null, n); + }, + chmod(path, mode, callback) { callback(enosys()); }, + chown(path, uid, gid, callback) { callback(enosys()); }, + close(fd, callback) { callback(enosys()); }, + fchmod(fd, mode, callback) { callback(enosys()); }, + fchown(fd, uid, gid, callback) { callback(enosys()); }, + fstat(fd, callback) { callback(enosys()); }, + fsync(fd, callback) { callback(null); }, + ftruncate(fd, length, callback) { callback(enosys()); }, + lchown(path, uid, gid, callback) { callback(enosys()); }, + link(path, link, callback) { callback(enosys()); }, + lstat(path, callback) { callback(enosys()); }, + mkdir(path, perm, callback) { callback(enosys()); }, + open(path, flags, mode, callback) { callback(enosys()); }, + read(fd, buffer, offset, length, position, callback) { callback(enosys()); }, + readdir(path, callback) { callback(enosys()); }, + readlink(path, callback) { callback(enosys()); }, + rename(from, to, callback) { callback(enosys()); }, + rmdir(path, callback) { callback(enosys()); }, + stat(path, callback) { callback(enosys()); }, + symlink(path, link, callback) { callback(enosys()); }, + truncate(path, length, callback) { callback(enosys()); }, + unlink(path, callback) { callback(enosys()); }, + utimes(path, atime, mtime, callback) { callback(enosys()); }, + }; + } + + if (!globalThis.process) { + globalThis.process = { + getuid() { return -1; }, + getgid() { return -1; }, + geteuid() { return -1; }, + getegid() { return -1; }, + getgroups() { throw enosys(); }, + pid: -1, + ppid: -1, + umask() { throw enosys(); }, + cwd() { throw enosys(); }, + chdir() { throw enosys(); }, + } + } + + if (!globalThis.crypto) { + throw new Error("globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)"); + } + + if (!globalThis.performance) { + throw new Error("globalThis.performance is not available, polyfill required (performance.now only)"); + } + + if (!globalThis.TextEncoder) { + throw new Error("globalThis.TextEncoder is not available, polyfill required"); + } + + if (!globalThis.TextDecoder) { + throw new Error("globalThis.TextDecoder is not available, polyfill required"); + } + + const encoder = new TextEncoder("utf-8"); + const decoder = new TextDecoder("utf-8"); + + globalThis.Go = class { + constructor() { + this.argv = ["js"]; + this.env = {}; + this.exit = (code) => { + if (code !== 0) { + console.warn("exit code:", code); + } + }; + this._exitPromise = new Promise((resolve) => { + this._resolveExitPromise = resolve; + }); + this._pendingEvent = null; + this._scheduledTimeouts = new Map(); + this._nextCallbackTimeoutID = 1; + + const setInt64 = (addr, v) => { + this.mem.setUint32(addr + 0, v, true); + this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true); + } + + const getInt64 = (addr) => { + const low = this.mem.getUint32(addr + 0, true); + const high = this.mem.getInt32(addr + 4, true); + return low + high * 4294967296; + } + + const loadValue = (addr) => { + const f = this.mem.getFloat64(addr, true); + if (f === 0) { + return undefined; + } + if (!isNaN(f)) { + return f; + } + + const id = this.mem.getUint32(addr, true); + return this._values[id]; + } + + const storeValue = (addr, v) => { + const nanHead = 0x7FF80000; + + if (typeof v === "number" && v !== 0) { + if (isNaN(v)) { + this.mem.setUint32(addr + 4, nanHead, true); + this.mem.setUint32(addr, 0, true); + return; + } + this.mem.setFloat64(addr, v, true); + return; + } + + if (v === undefined) { + this.mem.setFloat64(addr, 0, true); + return; + } + + let id = this._ids.get(v); + if (id === undefined) { + id = this._idPool.pop(); + if (id === undefined) { + id = this._values.length; + } + this._values[id] = v; + this._goRefCounts[id] = 0; + this._ids.set(v, id); + } + this._goRefCounts[id]++; + let typeFlag = 0; + switch (typeof v) { + case "object": + if (v !== null) { + typeFlag = 1; + } + break; + case "string": + typeFlag = 2; + break; + case "symbol": + typeFlag = 3; + break; + case "function": + typeFlag = 4; + break; + } + this.mem.setUint32(addr + 4, nanHead | typeFlag, true); + this.mem.setUint32(addr, id, true); + } + + const loadSlice = (addr) => { + const array = getInt64(addr + 0); + const len = getInt64(addr + 8); + return new Uint8Array(this._inst.exports.mem.buffer, array, len); + } + + const loadSliceOfValues = (addr) => { + const array = getInt64(addr + 0); + const len = getInt64(addr + 8); + const a = new Array(len); + for (let i = 0; i < len; i++) { + a[i] = loadValue(array + i * 8); + } + return a; + } + + const loadString = (addr) => { + const saddr = getInt64(addr + 0); + const len = getInt64(addr + 8); + return decoder.decode(new DataView(this._inst.exports.mem.buffer, saddr, len)); + } + + const timeOrigin = Date.now() - performance.now(); + this.importObject = { + go: { + // Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters) + // may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported + // function. A goroutine can switch to a new stack if the current stack is too small (see morestack function). + // This changes the SP, thus we have to update the SP used by the imported function. + + // func wasmExit(code int32) + "runtime.wasmExit": (sp) => { + sp >>>= 0; + const code = this.mem.getInt32(sp + 8, true); + this.exited = true; + delete this._inst; + delete this._values; + delete this._goRefCounts; + delete this._ids; + delete this._idPool; + this.exit(code); + }, + + // func wasmWrite(fd uintptr, p unsafe.Pointer, n int32) + "runtime.wasmWrite": (sp) => { + sp >>>= 0; + const fd = getInt64(sp + 8); + const p = getInt64(sp + 16); + const n = this.mem.getInt32(sp + 24, true); + fs.writeSync(fd, new Uint8Array(this._inst.exports.mem.buffer, p, n)); + }, + + // func resetMemoryDataView() + "runtime.resetMemoryDataView": (sp) => { + sp >>>= 0; + this.mem = new DataView(this._inst.exports.mem.buffer); + }, + + // func nanotime1() int64 + "runtime.nanotime1": (sp) => { + sp >>>= 0; + setInt64(sp + 8, (timeOrigin + performance.now()) * 1000000); + }, + + // func walltime() (sec int64, nsec int32) + "runtime.walltime": (sp) => { + sp >>>= 0; + const msec = (new Date).getTime(); + setInt64(sp + 8, msec / 1000); + this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true); + }, + + // func scheduleTimeoutEvent(delay int64) int32 + "runtime.scheduleTimeoutEvent": (sp) => { + sp >>>= 0; + const id = this._nextCallbackTimeoutID; + this._nextCallbackTimeoutID++; + this._scheduledTimeouts.set(id, setTimeout( + () => { + this._resume(); + while (this._scheduledTimeouts.has(id)) { + // for some reason Go failed to register the timeout event, log and try again + // (temporary workaround for https://github.com/golang/go/issues/28975) + console.warn("scheduleTimeoutEvent: missed timeout event"); + this._resume(); + } + }, + getInt64(sp + 8) + 1, // setTimeout has been seen to fire up to 1 millisecond early + )); + this.mem.setInt32(sp + 16, id, true); + }, + + // func clearTimeoutEvent(id int32) + "runtime.clearTimeoutEvent": (sp) => { + sp >>>= 0; + const id = this.mem.getInt32(sp + 8, true); + clearTimeout(this._scheduledTimeouts.get(id)); + this._scheduledTimeouts.delete(id); + }, + + // func getRandomData(r []byte) + "runtime.getRandomData": (sp) => { + sp >>>= 0; + crypto.getRandomValues(loadSlice(sp + 8)); + }, + + // func finalizeRef(v ref) + "syscall/js.finalizeRef": (sp) => { + sp >>>= 0; + const id = this.mem.getUint32(sp + 8, true); + this._goRefCounts[id]--; + if (this._goRefCounts[id] === 0) { + const v = this._values[id]; + this._values[id] = null; + this._ids.delete(v); + this._idPool.push(id); + } + }, + + // func stringVal(value string) ref + "syscall/js.stringVal": (sp) => { + sp >>>= 0; + storeValue(sp + 24, loadString(sp + 8)); + }, + + // func valueGet(v ref, p string) ref + "syscall/js.valueGet": (sp) => { + sp >>>= 0; + const result = Reflect.get(loadValue(sp + 8), loadString(sp + 16)); + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 32, result); + }, + + // func valueSet(v ref, p string, x ref) + "syscall/js.valueSet": (sp) => { + sp >>>= 0; + Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32)); + }, + + // func valueDelete(v ref, p string) + "syscall/js.valueDelete": (sp) => { + sp >>>= 0; + Reflect.deleteProperty(loadValue(sp + 8), loadString(sp + 16)); + }, + + // func valueIndex(v ref, i int) ref + "syscall/js.valueIndex": (sp) => { + sp >>>= 0; + storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16))); + }, + + // valueSetIndex(v ref, i int, x ref) + "syscall/js.valueSetIndex": (sp) => { + sp >>>= 0; + Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24)); + }, + + // func valueCall(v ref, m string, args []ref) (ref, bool) + "syscall/js.valueCall": (sp) => { + sp >>>= 0; + try { + const v = loadValue(sp + 8); + const m = Reflect.get(v, loadString(sp + 16)); + const args = loadSliceOfValues(sp + 32); + const result = Reflect.apply(m, v, args); + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 56, result); + this.mem.setUint8(sp + 64, 1); + } catch (err) { + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 56, err); + this.mem.setUint8(sp + 64, 0); + } + }, + + // func valueInvoke(v ref, args []ref) (ref, bool) + "syscall/js.valueInvoke": (sp) => { + sp >>>= 0; + try { + const v = loadValue(sp + 8); + const args = loadSliceOfValues(sp + 16); + const result = Reflect.apply(v, undefined, args); + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 40, result); + this.mem.setUint8(sp + 48, 1); + } catch (err) { + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 40, err); + this.mem.setUint8(sp + 48, 0); + } + }, + + // func valueNew(v ref, args []ref) (ref, bool) + "syscall/js.valueNew": (sp) => { + sp >>>= 0; + try { + const v = loadValue(sp + 8); + const args = loadSliceOfValues(sp + 16); + const result = Reflect.construct(v, args); + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 40, result); + this.mem.setUint8(sp + 48, 1); + } catch (err) { + sp = this._inst.exports.getsp() >>> 0; // see comment above + storeValue(sp + 40, err); + this.mem.setUint8(sp + 48, 0); + } + }, + + // func valueLength(v ref) int + "syscall/js.valueLength": (sp) => { + sp >>>= 0; + setInt64(sp + 16, parseInt(loadValue(sp + 8).length)); + }, + + // valuePrepareString(v ref) (ref, int) + "syscall/js.valuePrepareString": (sp) => { + sp >>>= 0; + const str = encoder.encode(String(loadValue(sp + 8))); + storeValue(sp + 16, str); + setInt64(sp + 24, str.length); + }, + + // valueLoadString(v ref, b []byte) + "syscall/js.valueLoadString": (sp) => { + sp >>>= 0; + const str = loadValue(sp + 8); + loadSlice(sp + 16).set(str); + }, + + // func valueInstanceOf(v ref, t ref) bool + "syscall/js.valueInstanceOf": (sp) => { + sp >>>= 0; + this.mem.setUint8(sp + 24, (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0); + }, + + // func copyBytesToGo(dst []byte, src ref) (int, bool) + "syscall/js.copyBytesToGo": (sp) => { + sp >>>= 0; + const dst = loadSlice(sp + 8); + const src = loadValue(sp + 32); + if (!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)) { + this.mem.setUint8(sp + 48, 0); + return; + } + const toCopy = src.subarray(0, dst.length); + dst.set(toCopy); + setInt64(sp + 40, toCopy.length); + this.mem.setUint8(sp + 48, 1); + }, + + // func copyBytesToJS(dst ref, src []byte) (int, bool) + "syscall/js.copyBytesToJS": (sp) => { + sp >>>= 0; + const dst = loadValue(sp + 8); + const src = loadSlice(sp + 16); + if (!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)) { + this.mem.setUint8(sp + 48, 0); + return; + } + const toCopy = src.subarray(0, dst.length); + dst.set(toCopy); + setInt64(sp + 40, toCopy.length); + this.mem.setUint8(sp + 48, 1); + }, + + "debug": (value) => { + console.log(value); + }, + } + }; + } + + async run(instance) { + if (!(instance instanceof WebAssembly.Instance)) { + throw new Error("Go.run: WebAssembly.Instance expected"); + } + this._inst = instance; + this.mem = new DataView(this._inst.exports.mem.buffer); + this._values = [ // JS values that Go currently has references to, indexed by reference id + NaN, + 0, + null, + true, + false, + globalThis, + this, + ]; + this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id + this._ids = new Map([ // mapping from JS values to reference ids + [0, 1], + [null, 2], + [true, 3], + [false, 4], + [globalThis, 5], + [this, 6], + ]); + this._idPool = []; // unused ids that have been garbage collected + this.exited = false; // whether the Go program has exited + + // Pass command line arguments and environment variables to WebAssembly by writing them to the linear memory. + let offset = 4096; + + const strPtr = (str) => { + const ptr = offset; + const bytes = encoder.encode(str + "\0"); + new Uint8Array(this.mem.buffer, offset, bytes.length).set(bytes); + offset += bytes.length; + if (offset % 8 !== 0) { + offset += 8 - (offset % 8); + } + return ptr; + }; + + const argc = this.argv.length; + + const argvPtrs = []; + this.argv.forEach((arg) => { + argvPtrs.push(strPtr(arg)); + }); + argvPtrs.push(0); + + const keys = Object.keys(this.env).sort(); + keys.forEach((key) => { + argvPtrs.push(strPtr(`${key}=${this.env[key]}`)); + }); + argvPtrs.push(0); + + const argv = offset; + argvPtrs.forEach((ptr) => { + this.mem.setUint32(offset, ptr, true); + this.mem.setUint32(offset + 4, 0, true); + offset += 8; + }); + + // The linker guarantees global data starts from at least wasmMinDataAddr. + // Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr. + const wasmMinDataAddr = 4096 + 8192; + if (offset >= wasmMinDataAddr) { + throw new Error("total length of command line and environment variables exceeds limit"); + } + + this._inst.exports.run(argc, argv); + if (this.exited) { + this._resolveExitPromise(); + } + await this._exitPromise; + } + + _resume() { + if (this.exited) { + throw new Error("Go program has already exited"); + } + this._inst.exports.resume(); + if (this.exited) { + this._resolveExitPromise(); + } + } + + _makeFuncWrapper(id) { + const go = this; + return function () { + const event = { id: id, this: this, args: arguments }; + go._pendingEvent = event; + go._resume(); + return event.result; + }; + } + } +})(); diff --git a/internal/pkg/controllers/grafanadashboard_controller.go b/internal/pkg/controllers/grafanadashboard_controller.go index 9a9464fa..fccccda9 100644 --- a/internal/pkg/controllers/grafanadashboard_controller.go +++ b/internal/pkg/controllers/grafanadashboard_controller.go @@ -3,21 +3,20 @@ package controllers import ( "context" - "sigs.k8s.io/controller-runtime/pkg/controller" - k8skevingomezfrv1 "github.com/K-Phoen/dark/api/v1" "github.com/K-Phoen/dark/internal/pkg/grafana" + "github.com/K-Phoen/dark/internal/pkg/model" "github.com/K-Phoen/grabana" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" ) const grafanaDashboardFinalizerName = "grafanadashboards.k8s.kevingomez.fr/finalizer" -const DashboardFolderAnnotation = "dark/folder" type dashboardManager interface { FromRawSpec(ctx context.Context, folderName string, uid string, rawJSON []byte) error @@ -103,7 +102,7 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req return ctrl.Result{}, nil } - folder := dashboard.Annotations[DashboardFolderAnnotation] + folder := dashboard.Annotations[model.DashboardFolderAnnotation] if dashboard.Folder != "" { folder = dashboard.Folder } diff --git a/internal/pkg/converter/json.go b/internal/pkg/converter/json.go index 1e466076..956f9dcf 100644 --- a/internal/pkg/converter/json.go +++ b/internal/pkg/converter/json.go @@ -6,7 +6,7 @@ import ( "io" v1 "github.com/K-Phoen/dark/api/v1" - "github.com/K-Phoen/dark/internal/pkg/controllers" + "github.com/K-Phoen/dark/internal/pkg/model" grabana "github.com/K-Phoen/grabana/decoder" "github.com/K-Phoen/sdk" "go.uber.org/zap" @@ -90,7 +90,7 @@ func (converter *JSON) ToK8SManifest(input io.Reader, output io.Writer, options if options.Folder != "" { manifest.Metadata["annotations"] = map[string]string{ - controllers.DashboardFolderAnnotation: options.Folder, + model.DashboardFolderAnnotation: options.Folder, } } diff --git a/internal/pkg/model/constants.go b/internal/pkg/model/constants.go new file mode 100644 index 00000000..663f3857 --- /dev/null +++ b/internal/pkg/model/constants.go @@ -0,0 +1,3 @@ +package model + +const DashboardFolderAnnotation = "dark/folder"