cob-cli 2.13.2 → 2.15.0

package/templates/dashboards/dash/src/App.vue

@@ -6,7 +6,7 @@
         <div v-else-if="dashboardState=='Error'" class="text-center my-20 text-2xl text-red-500">
             {{error}}
         </div>
-        <Dashboard v-else :dashboard="dashboardParsed" />
+        <Dashboard v-else :dashboard="dashboardParsed" :userInfo="userInfo" />
     </div>
 </template>
 

package/templates/dashboards/dash/src/collector.js

@@ -11,7 +11,7 @@ function collect(bucket, source) {
         //Means that found one key in current source
         if (Array.isArray(bucket[sourceName])) {
             // Means type of value to collect is array
-            if( bucket[sourceName].length == 0  || bucket[sourceName][0]["Mark"] == "JUST COPY" ) {
+            if(bucket[sourceName].length === 0 || bucket[sourceName][0]["Mark"] === "JUST COPY" ) {
                 //Means the bucket template only specify to get the raw elements that match (empty array in bucket template or having first element signaled that it was originally an empty array)
                 source["Mark"] = "JUST COPY"       // Signal it was an empty array
                 source[sourceName] = source.value  // Add extra field with original name of the source
@@ -122,12 +122,14 @@ function parseDashboard(raw_dashboard, userInfo){
                 "KibanaClasses": "",
                 "OutputVarKibana": "",
                 "InputVarKibana": [{}],
+                "InputQueryKibana": ""
             }],
             "ShareLink": "",
         },
         "Filter": {
             "FilterCustomize": [{
-                "FilterClasses": ""
+                "FilterClasses": "",
+                "Placeholder": ""
             }],
             "OutputVarFilter": "",
         }
@@ -158,14 +160,14 @@ function parseDashboard(raw_dashboard, userInfo){
         c.userInfo = userInfo
         c.vars = dash.vars
 
-        if (c.Component == "Menu") {
+        if (c.Component === "Menu") {
             c.Text.forEach(t => {
                 // If Attention is configured for this menu line then add attention status as user check
                 if(t["TextCustomize"][0]["TextAttention"]) {
                     t["TextCustomize"][0].AttentionInfo = dashFunctions.instancesList("Dashboard-Attention","name.raw:" + t["TextCustomize"][0]["TextAttention"],1,0,{validity:30})
                 }
             })
-        } else if (c.Component == "Totals") {
+        } else if (c.Component === "Totals") {
             c.Line.forEach(l => {
                 l.Value = l.Value.map(v => {
                     if(v.Arg[2] && (v.Arg[2]+"").startsWith("{")) {
@@ -176,17 +178,23 @@ function parseDashboard(raw_dashboard, userInfo){
                         v["ValueCustomize"][0].AttentionInfo = dashFunctions.instancesList("Dashboard-Attention","name.raw:" + v["ValueCustomize"][0]["ValueAttention"],1,0,{validity:10})
                     }
 
-                    if(v.Value == 'Label') {
+                    if(v.Value === 'Label') {
                         v.dash_info = {value: v.Arg[0].Arg, state:"ready"}
-                    } else if(v.Value == 'link') {
+                    } else if(v.Value === 'link') {
                         v.dash_info = { value: icon, href: url, state: undefined, isLink: true }
                     } else {
                         // add dash-info values in Totals
-                        v.dash_info = dashFunctions[v.Value].apply(this, v['Arg'].map( a => a['Arg'])) // Return DashInfo, which is used by the component
+                        v.dash_info = dashFunctions[v.Value].apply(this, v['Arg'].map( a =>
+                            a['Arg'].replaceAll("__USERNAME__",c.userInfo.username)
+                        )) // Return DashInfo, which is used by the component
                     }
                     return v
                 })
             })
+        }else if (c.Component === "Kibana") {
+            if (c["KibanaCustomize"][0]["InputQueryKibana"] !== null) {
+                c["KibanaCustomize"][0]["InputQueryKibana"] = c["KibanaCustomize"][0]["InputQueryKibana"].replaceAll("__USERNAME__", c.userInfo.username)
+            }
         }
     }))
     return dash

package/templates/dashboards/dash/src/components/Board.vue

@@ -3,8 +3,8 @@
         <template v-for="(item, i) in components">
             <Label  v-if="item['Component'] == 'Label'"  :component="item" :key="i" />
             <Menu   v-if="item['Component'] == 'Menu'"   :component="item" :key="i" />
-            <Totals v-if="item['Component'] == 'Totals'" :component="item" :key="i" />
-            <Kibana v-if="item['Component'] == 'Kibana'" :component="item" :key="i" />
+            <Totals v-if="item['Component'] == 'Totals'" :component="item" :key="i" :userInfo="userInfo"/>
+            <Kibana v-if="item['Component'] == 'Kibana'" :component="item" :key="i" :userInfo="userInfo"/>
             <Filtro v-if="item['Component'] == 'Filter'" :component="item" :key="i" />
         </template>
     </div>
@@ -19,7 +19,10 @@
 
     export default {
         components: { Label, Menu, Totals, Kibana, Filtro },
-        props: { board: Object },
+        props: {
+          board: Object,
+          userInfo: Object
+        },
         computed: {
             options()    { return this.board['BoardCustomize'][0] },
             components() { return this.board['Component'] },

package/templates/dashboards/dash/src/components/Dashboard.vue

@@ -1,7 +1,7 @@
 <template>
     <div :class="classes" :style="image" >
         <div :class="width + ' ' + grid">
-            <Board v-for="(board,i) in boards" :board="board" :key="i"/>
+            <Board v-for="(board,i) in boards" :board="board" :key="i" :userInfo="userInfo"/>
         </div>
     </div>
 </template>
@@ -11,7 +11,10 @@
 
     export default {
         components: { Board },
-        props: { dashboard: Object },
+        props: {
+          dashboard: Object,
+          userInfo: Object
+        },
         computed: {
             options() { return this.dashboard['DashboardCustomize'][0] },
             boards()  { return this.dashboard['Board'] },

package/templates/dashboards/dash/src/components/Filter.vue

@@ -6,7 +6,7 @@
             @keyup.enter="applyFilter"
             @focus="resize"
             @keyup="resize"
-            placeholder="Pesquisar ..."
+            :placeholder="placeholder"
         ></textarea>
         <button @click="applyFilter" type="submit" class="max-h-11 p-2.5 ml-2 text-sm font-medium text-white bg-blue-700 rounded-lg border border-blue-700 hover:bg-blue-800">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path></svg>
@@ -34,9 +34,10 @@
             }
         },
         computed: {
-            options()   { return this.component['FilterCustomize'][0] },
-            outputVar() { return this.component['OutputVarFilter'] || "" },
-            classes()   { return this.options['FilterClasses']     || "w-full max-w-xs resize-none min-h-min h-min border border-slate-300 rounded-md py-2 px-2 outline-slate-300 leading-5" },
+            options()     { return this.component['FilterCustomize'][0] },
+            outputVar()   { return this.component['OutputVarFilter'] || "" },
+            placeholder() { return this.options['Placeholder']       || "Pesquisar ..." },
+            classes()     { return this.options['FilterClasses']     || "w-full max-w-xs resize-none min-h-min h-min border border-slate-300 rounded-md py-2 px-2 outline-slate-300 leading-5" },
         },
         methods: {
             applyFilter: function() {

package/templates/dashboards/dash/src/components/Kibana.vue

@@ -4,7 +4,10 @@
 
 <script>
     export default {
-        props: { component: Object },
+        props: {
+          component: Object,
+          userInfo: Object
+        },
         data: () => ({
             iFrame: null,
             outputFilter: ""
@@ -27,8 +30,13 @@
             options()     { return this.component['KibanaCustomize'][0] },
             shareLink()   { return this.component['ShareLink']   || "" },
             classes()     { return this.options['KibanaClasses'] || "" },
+            fixedQuery()  { return this.options['InputQueryKibana']|| "" },
             inputs()      { return this.options['InputVarKibana'].map(v => v['InputVarKibana']) },
-            inputFilter() { return this.inputs.filter(v => this.component.vars[v]).map(v => this.component.vars[v]).join(" ")},
+            inputFilter() {
+              let filters = this.inputs.filter(v => this.component.vars[v]).map(v => this.component.vars[v]);
+              if (this.fixedQuery !== "") filters.push(" AND (" + this.fixedQuery + ")");
+              return filters.join(" ")
+            },
             outputVar()   { return this.options['OutputVarKibana']     || "" },
         },
         methods: {
@@ -71,19 +79,40 @@
                 // Só vale a pena reagir aos eventos de mudança de filtro no Kibana
                 if(event && event.data && event.data.filters) {
                     var filters = []
-                    for(let filter of event.data.filters) {
-                        var queryStr;
-                        var negateStr = filter.meta.negate ? "-" : "";
-                        var enabled = !filter.meta.disabled;
+                    for (let filter of event.data.filters) {
+                        let queryStr = "";
+                        let negateStr = filter.meta.negate ? "-" : "";
+                        let enabled = !filter.meta.disabled;
+                        let key;
+
+                        let query = filter.query;
+
+                        if (query.query_string) {
+                            // condições incluídas no próprio dashboard via query DSL
+                            queryStr = query.query_string.query;
+
+                        } else if (query.query) {
+                            queryStr = query.query;
 
-                        if(filter.query.query_string) {
-                            queryStr = filter.query.query_string.query;
-                        } else if (filter.query.match_phrase) {
-                            var key = Object.keys(filter.query.match_phrase)[0];
-                            queryStr = key + ':"' + filter.query.match_phrase[key] + '"';
+                        } else if (query.match) {
+                            key = Object.keys(query.match)[0];
+                            queryStr = key + ':"' + query.match[key] + '"';
+
+                        } else if (query.match_phrase) {
+                            key = Object.keys(query.match_phrase)[0];
+                            let _phrase = query.match_phrase[key];
+                            queryStr = key + ':"' + (_phrase instanceof Object ? _phrase.query : _phrase) + '"';
+
+                        } else if (query.bool && query.bool.must.length === 1 && query.bool.must[0].query_string) {
+                            // filtros adicionados a partir de visualizações com splits por filtros
+                            queryStr = query.bool.must[0].query_string.query;
+
+                        } else {
+                            window.console.error('COB', "unknown filter, can't send to RM", filter);
                         }
-                        if (enabled) filters.push(negateStr + "(" +queryStr + ")");
-                    };
+
+                        if (enabled) filters.push(negateStr + "(" + queryStr + ")");
+                    }
                     this.outputFilter = filters.length > 0 ? filters.join(" AND ") : ""
                     this.$set(this.component.vars, this.outputVar, this.outputFilter)
                 }
@@ -98,7 +127,8 @@
                         //O Kibana já está pronto mas ainda está a carregar dados. Voltar a tentar em 100ms
                         setTimeout(this.updateKibanaQuery, 100)
                     } else {
-                        this.iFrame.contentWindow.postMessage({"query":{ "query_string":{ "query": this.inputFilter || "*" } }}, '*');                  
+                        console.debug("KIBANA QUERY: ", this.inputFilter.replaceAll("__USERNAME__",this.userInfo.username) );
+                        this.iFrame.contentWindow.postMessage({"query":{ "query_string":{ "query": this.inputFilter.replaceAll("__USERNAME__",this.userInfo.username) || "*" } }}, '*');                  
                     }
                 }
             }

package/templates/dashboards/dash/src/components/Totals.vue

@@ -16,7 +16,10 @@
 
     export default {
         components: { TotalsValue },
-        props: { component: Object },
+        props: {
+          component: Object,
+          userInfo: Object
+        },
         computed: {
             options()     { return this.component['TotalsCustomize'][0] },
             classes()     { return this.options['TotalsClasses'] || "w-full table-auto" },
@@ -35,8 +38,9 @@
                 if(newValue == "") return //PRESSUPOSTO IMPORTANTE: se newValue é vazio é porque estamos em transições (porque usamos sempre um valor, nem que seja *) e o melhor é usar o valor antigo para o valor não mudar momentaneamente (e ainda desperdicar uma pesquisa). Se o pressuposto for quebrado vamos impedir a actualização do inputFilter quando o valor é ""
                 this.lines.forEach(l => {
                     l.values.forEach(v => {
-                        let newFilter = ((v.Arg[1] || "") + newValue.trim()) || "*"
-                        if(v.dash_info) v.dash_info.changeArgs({query: newFilter  })
+                      let arg = (v.Arg[1] instanceof Object ? v.Arg[1].Arg : v.Arg[1])
+                      let newFilter = ((arg || "") + " " + newValue.trim()) || "*"
+                      if (v.dash_info) v.dash_info.changeArgs({query: newFilter.replaceAll("__USERNAME__",this.userInfo.username)})
                     });
                 });
             }