From cc43ab26db906411747b60081d3f7e8eeea4f60e Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 15 Feb 2024 16:25:11 +0100 Subject: [PATCH 1/5] #11634 deleted ha legacy --- pandora_console/extras/delete_files/delete_files.txt | 2 ++ pandora_console/extras/mr/68.sql | 2 ++ pandora_console/include/class/ConsoleSupervisor.php | 2 +- pandora_console/include/functions_config.php | 8 -------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt index b3fbea46dd..040a88497b 100644 --- a/pandora_console/extras/delete_files/delete_files.txt +++ b/pandora_console/extras/delete_files/delete_files.txt @@ -1738,3 +1738,5 @@ extensions/files_repo/sql/files_repo.sql extensions/files_repo extensions/resource_exportation.php extensions/resource_registration.php +enterprise/include/class/DatabaseHA.class.php +enterprise/godmode/servers/HA_cluster.php \ No newline at end of file diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql index 80038a0e0d..00623ccaf7 100644 --- a/pandora_console/extras/mr/68.sql +++ b/pandora_console/extras/mr/68.sql @@ -86,4 +86,6 @@ INSERT IGNORE INTO `tcredential_store` (`identifier`, `id_group`, `product`, `ex ; UPDATE `trecon_task` SET `auth_strings` = IF(`auth_strings` = '',CONCAT(@creds_name,`id_rt`),CONCAT(@creds_name,`id_rt`,',',`auth_strings`)) WHERE `snmp_version` = 3 AND `snmp_enabled` = 1; +DELETE FROM tconfig WHERE `token` = 'legacy_database_ha' + COMMIT; \ No newline at end of file diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 8f57ec9138..dd3a4016fe 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -3008,7 +3008,7 @@ class ConsoleSupervisor public function checkHaStatus() { global $config; - enterprise_include_once('include/class/DatabaseHA.class.php'); + enterprise_include_once('include/class/NewDatabaseHA.class.php'); $cluster = new DatabaseHA(); $nodes = $cluster->getNodes(); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 268bfe45b4..572ea9323e 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -503,10 +503,6 @@ function config_update_config() $error_update[] = __('Enable Update Manager'); } - if (config_update_value('legacy_database_ha', get_parameter('legacy_database_ha'), true) === false) { - $error_update[] = __('Legacy database HA'); - } - if (config_update_value('agent_vulnerabilities', get_parameter('agent_vulnerabilities'), true) === false) { $error_update[] = __('agent_vulnerabilities'); } @@ -2424,10 +2420,6 @@ function config_process_config() config_update_value('enable_update_manager', 1); } - if (!isset($config['legacy_database_ha'])) { - config_update_value('legacy_database_ha', 0); - } - if (!isset($config['disabled_newsletter'])) { config_update_value('disabled_newsletter', 0); } From af0f8a4fc48c7e6847362dd5fc7cdc71a0326b93 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 15 Feb 2024 16:40:18 +0100 Subject: [PATCH 2/5] #11634 updated url in console supervisor --- pandora_console/include/class/ConsoleSupervisor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index dd3a4016fe..fad31abaa2 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -3031,7 +3031,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.HAMASTER.MESSAGE', 'title' => __('Desynchronized operation on the node '.$node['host']), 'message' => __($message), - 'url' => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/HA_cluster', + 'url' => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/new_HA_cluster', 'icon_notification' => self::ICON_ERROR, ] ); From 289e067b6d5c7a374ad90ca36dc345805ef567e1 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 19 Mar 2024 11:18:20 +0100 Subject: [PATCH 3/5] #11634 fixed mr --- pandora_console/extras/mr/68.sql | 2 -- pandora_console/extras/mr/69.sql | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 pandora_console/extras/mr/69.sql diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql index 00623ccaf7..80038a0e0d 100644 --- a/pandora_console/extras/mr/68.sql +++ b/pandora_console/extras/mr/68.sql @@ -86,6 +86,4 @@ INSERT IGNORE INTO `tcredential_store` (`identifier`, `id_group`, `product`, `ex ; UPDATE `trecon_task` SET `auth_strings` = IF(`auth_strings` = '',CONCAT(@creds_name,`id_rt`),CONCAT(@creds_name,`id_rt`,',',`auth_strings`)) WHERE `snmp_version` = 3 AND `snmp_enabled` = 1; -DELETE FROM tconfig WHERE `token` = 'legacy_database_ha' - COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql new file mode 100644 index 0000000000..13a3b252e7 --- /dev/null +++ b/pandora_console/extras/mr/69.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +DELETE FROM tconfig WHERE `token` = 'legacy_database_ha' + +COMMIT; \ No newline at end of file From cd747579dbcc04691a975b106282c5073d36f931 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 25 Mar 2024 15:07:43 +0100 Subject: [PATCH 4/5] fixed conclics --- .../api/documentation/swagger-ui-bundle.js | 564 +++++++++--------- .../swagger-ui-es-bundle-core.js | 252 ++++---- .../api/documentation/swagger-ui-es-bundle.js | 484 +++++++-------- .../swagger-ui-standalone-preset.js | 4 +- .../api/documentation/swagger-ui.js | 171 +++--- 5 files changed, 745 insertions(+), 730 deletions(-) diff --git a/pandora_console/api/documentation/swagger-ui-bundle.js b/pandora_console/api/documentation/swagger-ui-bundle.js index c7d16e44f4..69d6da74a6 100644 --- a/pandora_console/api/documentation/swagger-ui-bundle.js +++ b/pandora_console/api/documentation/swagger-ui-bundle.js @@ -4675,9 +4675,8 @@ return ( "function" == typeof _ && "function" == typeof Symbol && - "symbol" == typeof _("foo") && - "symbol" == typeof Symbol("bar") && - w() + "symbol" == typeof _("foo") && + "symbol" == typeof Symbol("bar") && w() ); }; }, @@ -13387,9 +13386,7 @@ null != s && !w(s) ) || - j.test(s) || - !x.test(s) || - (null != i && s in Object(i)) + j.test(s) || !x.test(s) || (null != i && s in Object(i)) ); }; }, @@ -20233,8 +20230,7 @@ var i = s.memoizedState; if ( (null === i && - null !== (s = s.alternate) && - (i = s.memoizedState), + null !== (s = s.alternate) && (i = s.memoizedState), null !== i) ) return i.dehydrated; @@ -21701,8 +21697,7 @@ null !== ae && ((Z = ae), null !== X && - null != (ae = Kb(ee, X)) && - U.push(tf(ee, ae, Z))), + null != (ae = Kb(ee, X)) && U.push(tf(ee, ae, Z))), Y) ) break; @@ -21899,9 +21894,9 @@ } })(s, u)) && 0 < (_ = oe(_, "onBeforeInput")).length && - ((w = new fr("onBeforeInput", "beforeinput", null, u, w)), - j.push({ event: w, listeners: _ }), - (w.data = ce)); + ((w = new fr("onBeforeInput", "beforeinput", null, u, w)), + j.push({ event: w, listeners: _ }), + (w.data = ce)); } se(j, i); }); @@ -22540,8 +22535,8 @@ var U = s.alternate; null !== U && (P = (U = U.updateQueue).lastBaseUpdate) !== j && - (null === P ? (U.firstBaseUpdate = $) : (P.next = $), - (U.lastBaseUpdate = B)); + (null === P ? (U.firstBaseUpdate = $) : (P.next = $), + (U.lastBaseUpdate = B)); } if (null !== x) { var Y = w.baseState; @@ -22680,8 +22675,7 @@ ? s.shouldComponentUpdate(_, x, j) : !i.prototype || !i.prototype.isPureReactComponent || - !Ie(u, _) || - !Ie(w, x); + !Ie(u, _) || !Ie(w, x); } function ph(s, i, u) { var _ = !1, @@ -25173,11 +25167,11 @@ (s.sibling = null), 5 === s.tag && null !== (i = s.stateNode) && - (delete i[gn], - delete i[yn], - delete i[vn], - delete i[_n], - delete i[wn]), + (delete i[gn], + delete i[yn], + delete i[vn], + delete i[_n], + delete i[wn]), (s.stateNode = null), (s.return = null), (s.dependencies = null), @@ -25288,8 +25282,7 @@ case 15: if ( !Po && - null !== (_ = u.updateQueue) && - null !== (_ = _.lastEffect) + null !== (_ = u.updateQueue) && null !== (_ = _.lastEffect) ) { w = _ = _.next; do { @@ -26033,8 +26026,7 @@ return !0; })(w) && (2 === (i = Jk(s, _)) && - 0 !== (x = xc(s)) && - ((_ = x), (i = Ok(s, x))), + 0 !== (x = xc(s)) && ((_ = x), (i = Ok(s, x))), 1 === i)) ) throw ((u = Go), Lk(s, 0), Dk(s, _), Ek(s, yt()), u); @@ -28477,8 +28469,7 @@ return ( void 0 !== this._readableState && void 0 !== this._writableState && - this._readableState.destroyed && - this._writableState.destroyed + this._readableState.destroyed && this._writableState.destroyed ); }, set: function set(s) { @@ -29515,8 +29506,7 @@ return ( !!$.call(this, s) || (this === Writable && - s && - s._writableState instanceof WritableState) + s && s._writableState instanceof WritableState) ); } })) @@ -33999,8 +33989,7 @@ j = s; if ( "object" == typeof s && - (j = s[(_ = Object.keys(s)[0])]) && - j._elem + (j = s[(_ = Object.keys(s)[0])]) && j._elem ) return ( (j._elem.name = _), @@ -46948,11 +46937,10 @@ !!Jl(s) || (!!s && "object" == typeof s && - !_isString(s) && - (0 === s.length || - (s.length > 0 && - s.hasOwnProperty(0) && - s.hasOwnProperty(s.length - 1)))) + !_isString(s) && + (0 === s.length || + (s.length > 0 && + s.hasOwnProperty(0) && s.hasOwnProperty(s.length - 1)))) ); }); var sc = "undefined" != typeof Symbol ? Symbol.iterator : "@@iterator"; @@ -48548,10 +48536,10 @@ ? !(!s || "object" != typeof s || "string" != typeof s.uri) : ("undefined" != typeof File && s instanceof File) || ("undefined" != typeof Blob && s instanceof Blob) || - !!ArrayBuffer.isView(s) || - (null !== s && - "object" == typeof s && - "function" == typeof s.pipe) + !!ArrayBuffer.isView(s) || + (null !== s && + "object" == typeof s && + "function" == typeof s.pipe) ); } function isArrayOfFile(s, i) { @@ -49062,8 +49050,7 @@ "object" == typeof i && null !== i && "primitive" in i && - "function" == typeof i.primitive && - i.primitive() === s, + "function" == typeof i.primitive && i.primitive() === s, hasClass = (s, i) => "object" == typeof i && null !== i && @@ -58912,12 +58899,13 @@ const parameterEquals = (i, u) => !!s.isParameterElement(i) && !!s.isParameterElement(u) && - !!s.isStringElement(i.name) && - !!s.isStringElement(i.in) && - !!s.isStringElement(u.name) && - !!s.isStringElement(u.in) && - serializers_value(i.name) === serializers_value(u.name) && - serializers_value(i.in) === serializers_value(u.in), + !!s.isStringElement(i.name) && + !!s.isStringElement(i.in) && + !!s.isStringElement(u.name) && + !!s.isStringElement(u.in) && + serializers_value(i.name) === + serializers_value(u.name) && + serializers_value(i.in) === serializers_value(u.in), i = []; return { visitor: { @@ -62701,18 +62689,20 @@ He.createElement( "div", { className: "modal-ux-content" }, - j.valueSeq().map((j, B) => - He.createElement(P, { - key: B, - AST: x, - definitions: j, - getComponent: u, - errSelectors: _, - authSelectors: s, - authActions: i, - specSelectors: w - }) - ) + j + .valueSeq() + .map((j, B) => + He.createElement(P, { + key: B, + AST: x, + definitions: j, + getComponent: u, + errSelectors: _, + authSelectors: s, + authActions: i, + specSelectors: w + }) + ) ) ) ) @@ -65134,13 +65124,15 @@ He.createElement( "tbody", null, - s.entrySeq().map(([s, i]) => - He.createElement(u, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + s + .entrySeq() + .map(([s, i]) => + He.createElement(u, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) ) ) ) @@ -65568,13 +65560,15 @@ He.createElement(_e, { source: _.get("description") }) ), ie && le.size - ? le.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + ? le + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) : null, ae && _.get("content") ? He.createElement( @@ -66478,22 +66472,26 @@ ")" ), Z && et.size - ? et.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + ? et + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) : null, X && tt.size - ? tt.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + ? tt + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) : null ), He.createElement( @@ -68905,14 +68903,16 @@ He.createElement("span", { className: "brace-close" }, "}") ), ye.size - ? ye.entrySeq().map(([s, i]) => - He.createElement(Re, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: "property" - }) - ) + ? ye + .entrySeq() + .map(([s, i]) => + He.createElement(Re, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: "property" + }) + ) : null ); } @@ -69093,24 +69093,28 @@ ")" ), ae.size - ? ae.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: eI - }) - ) + ? ae + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: eI + }) + ) : null, P && ee.size - ? ee.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: eI - }) - ) + ? ee + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: eI + }) + ) : null, Z ? He.createElement(ce, { source: Z }) : null, ie && @@ -69444,13 +69448,12 @@ return ( !(s >= 55296 && s <= 57343) && !(s >= 64976 && s <= 65007) && - 65535 != (65535 & s) && - 65534 != (65535 & s) && - !(s >= 0 && s <= 8) && - 11 !== s && - !(s >= 14 && s <= 31) && - !(s >= 127 && s <= 159) && - !(s > 1114111) + 65535 != (65535 & s) && + 65534 != (65535 & s) && + !(s >= 0 && s <= 8) && + 11 !== s && + !(s >= 14 && s <= 31) && + !(s >= 127 && s <= 159) && !(s > 1114111) ); } function fromCodePoint(s) { @@ -71011,37 +71014,37 @@ return ( P !== $ + 2 && !(P + 1 >= U || 58 !== s.src.charCodeAt(++P)) && - (_ || - (P++, - s.env.footnotes || (s.env.footnotes = {}), - s.env.footnotes.refs || (s.env.footnotes.refs = {}), - (B = s.src.slice($ + 2, P - 2)), - (s.env.footnotes.refs[":" + B] = -1), - s.tokens.push({ - type: "footnote_reference_open", - label: B, - level: s.level++ - }), - (w = s.bMarks[i]), - (x = s.tShift[i]), - (j = s.parentType), - (s.tShift[i] = s.skipSpaces(P) - P), - (s.bMarks[i] = P), - (s.blkIndent += 4), - (s.parentType = "footnote"), - s.tShift[i] < s.blkIndent && - ((s.tShift[i] += s.blkIndent), - (s.bMarks[i] -= s.blkIndent)), - s.parser.tokenize(s, i, u, !0), - (s.parentType = j), - (s.blkIndent -= 4), - (s.tShift[i] = x), - (s.bMarks[i] = w), - s.tokens.push({ - type: "footnote_reference_close", - level: --s.level - })), - !0) + (_ || + (P++, + s.env.footnotes || (s.env.footnotes = {}), + s.env.footnotes.refs || (s.env.footnotes.refs = {}), + (B = s.src.slice($ + 2, P - 2)), + (s.env.footnotes.refs[":" + B] = -1), + s.tokens.push({ + type: "footnote_reference_open", + label: B, + level: s.level++ + }), + (w = s.bMarks[i]), + (x = s.tShift[i]), + (j = s.parentType), + (s.tShift[i] = s.skipSpaces(P) - P), + (s.bMarks[i] = P), + (s.blkIndent += 4), + (s.parentType = "footnote"), + s.tShift[i] < s.blkIndent && + ((s.tShift[i] += s.blkIndent), + (s.bMarks[i] -= s.blkIndent)), + s.parser.tokenize(s, i, u, !0), + (s.parentType = j), + (s.blkIndent -= 4), + (s.tShift[i] = x), + (s.bMarks[i] = w), + s.tokens.push({ + type: "footnote_reference_close", + level: --s.level + })), + !0) ); }, ["paragraph"] @@ -71104,32 +71107,32 @@ return ( !(j >= u) && !(s.tShift[j] < s.blkIndent) && - !(s.tShift[j] - s.blkIndent > 3) && - !((w = s.bMarks[j] + s.tShift[j]) >= (x = s.eMarks[j])) && - (45 === (_ = s.src.charCodeAt(w)) || 61 === _) && - ((w = s.skipChars(w, _)), - !((w = s.skipSpaces(w)) < x) && - ((w = s.bMarks[i] + s.tShift[i]), - (s.line = j + 1), - s.tokens.push({ - type: "heading_open", - hLevel: 61 === _ ? 1 : 2, - lines: [i, s.line], - level: s.level - }), - s.tokens.push({ - type: "inline", - content: s.src.slice(w, s.eMarks[i]).trim(), - level: s.level + 1, - lines: [i, s.line - 1], - children: [] - }), - s.tokens.push({ - type: "heading_close", - hLevel: 61 === _ ? 1 : 2, - level: s.level - }), - !0)) + !(s.tShift[j] - s.blkIndent > 3) && + !((w = s.bMarks[j] + s.tShift[j]) >= (x = s.eMarks[j])) && + (45 === (_ = s.src.charCodeAt(w)) || 61 === _) && + ((w = s.skipChars(w, _)), + !((w = s.skipSpaces(w)) < x) && + ((w = s.bMarks[i] + s.tShift[i]), + (s.line = j + 1), + s.tokens.push({ + type: "heading_open", + hLevel: 61 === _ ? 1 : 2, + lines: [i, s.line], + level: s.level + }), + s.tokens.push({ + type: "inline", + content: s.src.slice(w, s.eMarks[i]).trim(), + level: s.level + 1, + lines: [i, s.line - 1], + children: [] + }), + s.tokens.push({ + type: "heading_close", + hLevel: 61 === _ ? 1 : 2, + level: s.level + }), + !0)) ); } ], @@ -72273,31 +72276,31 @@ return ( !(P + 2 >= j) && 94 === s.src.charCodeAt(P) && - 91 === s.src.charCodeAt(P + 1) && - !(s.level >= s.options.maxNesting) && - ((u = P + 2), - !((_ = parseLinkLabel(s, P + 1)) < 0) && - (i || - (s.env.footnotes || (s.env.footnotes = {}), - s.env.footnotes.list || (s.env.footnotes.list = []), - (w = s.env.footnotes.list.length), - (s.pos = u), - (s.posMax = _), - s.push({ - type: "footnote_ref", - id: w, - level: s.level - }), - s.linkLevel++, - (x = s.tokens.length), - s.parser.tokenize(s), - (s.env.footnotes.list[w] = { - tokens: s.tokens.splice(x) - }), - s.linkLevel--), - (s.pos = _ + 1), - (s.posMax = j), - !0)) + 91 === s.src.charCodeAt(P + 1) && + !(s.level >= s.options.maxNesting) && + ((u = P + 2), + !((_ = parseLinkLabel(s, P + 1)) < 0) && + (i || + (s.env.footnotes || (s.env.footnotes = {}), + s.env.footnotes.list || (s.env.footnotes.list = []), + (w = s.env.footnotes.list.length), + (s.pos = u), + (s.posMax = _), + s.push({ + type: "footnote_ref", + id: w, + level: s.level + }), + s.linkLevel++, + (x = s.tokens.length), + s.parser.tokenize(s), + (s.env.footnotes.list[w] = { + tokens: s.tokens.splice(x) + }), + s.linkLevel--), + (s.pos = _ + 1), + (s.posMax = j), + !0)) ); } ], @@ -72323,27 +72326,27 @@ return ( _ !== P + 2 && !(_ >= j) && - (_++, - (u = s.src.slice(P + 2, _ - 1)), - void 0 !== s.env.footnotes.refs[":" + u] && - (i || - (s.env.footnotes.list || (s.env.footnotes.list = []), - s.env.footnotes.refs[":" + u] < 0 - ? ((w = s.env.footnotes.list.length), - (s.env.footnotes.list[w] = { label: u, count: 0 }), - (s.env.footnotes.refs[":" + u] = w)) - : (w = s.env.footnotes.refs[":" + u]), - (x = s.env.footnotes.list[w].count), - s.env.footnotes.list[w].count++, - s.push({ - type: "footnote_ref", - id: w, - subId: x, - level: s.level - })), - (s.pos = _), - (s.posMax = j), - !0)) + (_++, + (u = s.src.slice(P + 2, _ - 1)), + void 0 !== s.env.footnotes.refs[":" + u] && + (i || + (s.env.footnotes.list || (s.env.footnotes.list = []), + s.env.footnotes.refs[":" + u] < 0 + ? ((w = s.env.footnotes.list.length), + (s.env.footnotes.list[w] = { label: u, count: 0 }), + (s.env.footnotes.refs[":" + u] = w)) + : (w = s.env.footnotes.refs[":" + u]), + (x = s.env.footnotes.list[w].count), + s.env.footnotes.list[w].count++, + s.push({ + type: "footnote_ref", + id: w, + subId: x, + level: s.level + })), + (s.pos = _), + (s.posMax = j), + !0)) ); } ], @@ -72359,41 +72362,41 @@ return ( 60 === s.src.charCodeAt(P) && !((u = s.src.slice(P)).indexOf(">") < 0) && - ((_ = u.match(NI)) - ? !(II.indexOf(_[1].toLowerCase()) < 0) && - ((j = normalizeLink((x = _[0].slice(1, -1)))), - !!s.parser.validateLink(x) && - (i || - (s.push({ - type: "link_open", - href: j, - level: s.level - }), - s.push({ - type: "text", - content: x, - level: s.level + 1 - }), - s.push({ type: "link_close", level: s.level })), - (s.pos += _[0].length), - !0)) - : !!(w = u.match(PI)) && - ((j = normalizeLink("mailto:" + (x = w[0].slice(1, -1)))), - !!s.parser.validateLink(j) && - (i || - (s.push({ - type: "link_open", - href: j, - level: s.level - }), - s.push({ - type: "text", - content: x, - level: s.level + 1 - }), - s.push({ type: "link_close", level: s.level })), - (s.pos += w[0].length), - !0))) + ((_ = u.match(NI)) + ? !(II.indexOf(_[1].toLowerCase()) < 0) && + ((j = normalizeLink((x = _[0].slice(1, -1)))), + !!s.parser.validateLink(x) && + (i || + (s.push({ + type: "link_open", + href: j, + level: s.level + }), + s.push({ + type: "text", + content: x, + level: s.level + 1 + }), + s.push({ type: "link_close", level: s.level })), + (s.pos += _[0].length), + !0)) + : !!(w = u.match(PI)) && + ((j = normalizeLink("mailto:" + (x = w[0].slice(1, -1)))), + !!s.parser.validateLink(j) && + (i || + (s.push({ + type: "link_open", + href: j, + level: s.level + }), + s.push({ + type: "text", + content: x, + level: s.level + 1 + }), + s.push({ type: "link_close", level: s.level })), + (s.pos += w[0].length), + !0))) ); } ], @@ -72417,15 +72420,15 @@ return i >= 97 && i <= 122; })(u) ) && - !!(_ = s.src.slice(x).match(DI)) && - (i || - s.push({ - type: "htmltag", - content: s.src.slice(x, x + _[0].length), - level: s.level - }), - (s.pos += _[0].length), - !0)) + !!(_ = s.src.slice(x).match(DI)) && + (i || + s.push({ + type: "htmltag", + content: s.src.slice(x, x + _[0].length), + level: s.level + }), + (s.pos += _[0].length), + !0)) ); } ], @@ -73551,7 +73554,7 @@ return ( !(!s || !i) && !this.hasFullProtocolRegex.test(i) && - !this.hasWordCharAfterProtocolRegex.test(s) + !this.hasWordCharAfterProtocolRegex.test(s) ); }), (UrlMatchValidator.hasFullProtocolRegex = /^[A-Za-z][-.+A-Za-z0-9]*:\/\//), @@ -75974,17 +75977,19 @@ ? He.createElement( "select", { "data-variable": s, onChange: $ }, - u.get("enum").map(u => - He.createElement( - "option", - { - selected: u === w(i, s), - key: u, - value: u - }, - u + u + .get("enum") + .map(u => + He.createElement( + "option", + { + selected: u === w(i, s), + key: u, + value: u + }, + u + ) ) - ) ) : He.createElement("input", { type: "text", @@ -80761,8 +80766,7 @@ const { examples: i, example: u, default: _ } = s; return ( !!(Array.isArray(i) && i.length >= 1) || - void 0 !== _ || - void 0 !== u + void 0 !== _ || void 0 !== u ); }, extractExample = s => { diff --git a/pandora_console/api/documentation/swagger-ui-es-bundle-core.js b/pandora_console/api/documentation/swagger-ui-es-bundle-core.js index 0897eadaf3..a0770fdc9b 100644 --- a/pandora_console/api/documentation/swagger-ui-es-bundle-core.js +++ b/pandora_console/api/documentation/swagger-ui-es-bundle-core.js @@ -2323,8 +2323,7 @@ var ve = { return ( void 0 !== this._readableState && void 0 !== this._writableState && - this._readableState.destroyed && - this._writableState.destroyed + this._readableState.destroyed && this._writableState.destroyed ); }, set: function set(e) { @@ -3337,8 +3336,7 @@ var ve = { return ( !!c.call(this, e) || (this === Writable && - e && - e._writableState instanceof WritableState) + e && e._writableState instanceof WritableState) ); } })) @@ -10835,18 +10833,20 @@ var we = {}; Ke.default.createElement( "div", { className: "modal-ux-content" }, - s.valueSeq().map((s, i) => - Ke.default.createElement(l, { - key: i, - AST: o, - definitions: s, - getComponent: r, - errSelectors: n, - authSelectors: e, - authActions: t, - specSelectors: a - }) - ) + s + .valueSeq() + .map((s, i) => + Ke.default.createElement(l, { + key: i, + AST: o, + definitions: s, + getComponent: r, + errSelectors: n, + authSelectors: e, + authActions: t, + specSelectors: a + }) + ) ) ) ) @@ -13194,13 +13194,15 @@ var we = {}; Ke.default.createElement( "tbody", null, - e.entrySeq().map(([e, t]) => - Ke.default.createElement(r, { - key: `${e}-${t}`, - xKey: e, - xVal: t - }) - ) + e + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(r, { + key: `${e}-${t}`, + xKey: e, + xVal: t + }) + ) ) ) ) @@ -13625,13 +13627,15 @@ var we = {}; Ke.default.createElement(x, { source: n.get("description") }) ), g && y.size - ? y.entrySeq().map(([e, t]) => - Ke.default.createElement(v, { - key: `${e}-${t}`, - xKey: e, - xVal: t - }) - ) + ? y + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(v, { + key: `${e}-${t}`, + xKey: e, + xVal: t + }) + ) : null, h && n.get("content") ? Ke.default.createElement( @@ -16684,14 +16688,16 @@ var we = {}; Ke.default.createElement("span", { className: "brace-close" }, "}") ), w.size - ? w.entrySeq().map(([e, t]) => - Ke.default.createElement(R, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: "property" - }) - ) + ? w + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(R, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: "property" + }) + ) : null ); } @@ -16742,14 +16748,16 @@ var we = {}; { title: _, expanded: n <= a, collapsedContent: "[...]" }, "[", d.size - ? d.entrySeq().map(([e, t]) => - Ke.default.createElement(y, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: "property" - }) - ) + ? d + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(y, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: "property" + }) + ) : null, i ? Ke.default.createElement(f, { source: i }) @@ -16866,24 +16874,28 @@ var we = {}; ")" ), h.size - ? h.entrySeq().map(([e, t]) => - Ke.default.createElement(v, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: ka - }) - ) + ? h + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(v, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: ka + }) + ) : null, l && f.size - ? f.entrySeq().map(([e, t]) => - Ke.default.createElement(v, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: ka - }) - ) + ? f + .entrySeq() + .map(([e, t]) => + Ke.default.createElement(v, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: ka + }) + ) : null, m ? Ke.default.createElement(S, { source: m }) : null, g && @@ -18251,13 +18263,15 @@ var we = {}; ")" ), x && c.size - ? c.entrySeq().map(([e, r]) => - Ke.default.createElement(t, { - key: `${e}-${r}`, - xKey: e, - xVal: r - }) - ) + ? c + .entrySeq() + .map(([e, r]) => + Ke.default.createElement(t, { + key: `${e}-${r}`, + xKey: e, + xVal: r + }) + ) : null ), Ke.default.createElement( @@ -20370,12 +20384,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !c - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !c + }) }, c && Ke.default.createElement( @@ -20565,12 +20577,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !c - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !c + }) }, c && Ke.default.createElement( @@ -20651,12 +20661,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !c - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !c + }) }, c && Ke.default.createElement( @@ -21216,12 +21224,10 @@ var we = {}; "li", { key: e, - className: (0, ha.default)( - "json-schema-2020-12-$vocabulary-uri", - { - "json-schema-2020-12-$vocabulary-uri--disabled": !t - } - ) + className: (0, + ha.default)("json-schema-2020-12-$vocabulary-uri", { + "json-schema-2020-12-$vocabulary-uri--disabled": !t + }) }, Ke.default.createElement( "span", @@ -21416,12 +21422,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !n - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !n + }) }, n && Ke.default.createElement( @@ -21508,12 +21512,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !a - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !a + }) }, a && Ke.default.createElement( @@ -21581,12 +21583,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !a - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !a + }) }, a && Ke.default.createElement( @@ -21654,12 +21654,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !a - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !a + }) }, a && Ke.default.createElement( @@ -21815,12 +21813,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !n - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !n + }) }, n && Ke.default.createElement( @@ -21881,12 +21877,10 @@ var we = {}; Ke.default.createElement( "ul", { - className: (0, ha.default)( - "json-schema-2020-12-keyword__children", - { - "json-schema-2020-12-keyword__children--collapsed": !a - } - ) + className: (0, + ha.default)("json-schema-2020-12-keyword__children", { + "json-schema-2020-12-keyword__children--collapsed": !a + }) }, a && Ke.default.createElement( diff --git a/pandora_console/api/documentation/swagger-ui-es-bundle.js b/pandora_console/api/documentation/swagger-ui-es-bundle.js index d0cbef7112..53039891ad 100644 --- a/pandora_console/api/documentation/swagger-ui-es-bundle.js +++ b/pandora_console/api/documentation/swagger-ui-es-bundle.js @@ -4587,9 +4587,8 @@ return ( "function" == typeof _ && "function" == typeof Symbol && - "symbol" == typeof _("foo") && - "symbol" == typeof Symbol("bar") && - w() + "symbol" == typeof _("foo") && + "symbol" == typeof Symbol("bar") && w() ); }; }, @@ -13206,9 +13205,7 @@ null != s && !w(s) ) || - j.test(s) || - !x.test(s) || - (null != i && s in Object(i)) + j.test(s) || !x.test(s) || (null != i && s in Object(i)) ); }; }, @@ -19961,8 +19958,7 @@ var i = s.memoizedState; if ( (null === i && - null !== (s = s.alternate) && - (i = s.memoizedState), + null !== (s = s.alternate) && (i = s.memoizedState), null !== i) ) return i.dehydrated; @@ -21411,8 +21407,7 @@ null !== ae && ((Z = ae), null !== X && - null != (ae = Kb(ee, X)) && - U.push(tf(ee, ae, Z))), + null != (ae = Kb(ee, X)) && U.push(tf(ee, ae, Z))), Y) ) break; @@ -21608,9 +21603,9 @@ } })(s, u)) && 0 < (_ = oe(_, "onBeforeInput")).length && - ((w = new fr("onBeforeInput", "beforeinput", null, u, w)), - j.push({ event: w, listeners: _ }), - (w.data = ce)); + ((w = new fr("onBeforeInput", "beforeinput", null, u, w)), + j.push({ event: w, listeners: _ }), + (w.data = ce)); } se(j, i); }); @@ -22237,8 +22232,8 @@ var U = s.alternate; null !== U && (P = (U = U.updateQueue).lastBaseUpdate) !== j && - (null === P ? (U.firstBaseUpdate = $) : (P.next = $), - (U.lastBaseUpdate = B)); + (null === P ? (U.firstBaseUpdate = $) : (P.next = $), + (U.lastBaseUpdate = B)); } if (null !== x) { var Y = w.baseState; @@ -22377,8 +22372,7 @@ ? s.shouldComponentUpdate(_, x, j) : !i.prototype || !i.prototype.isPureReactComponent || - !Ie(u, _) || - !Ie(w, x); + !Ie(u, _) || !Ie(w, x); } function ph(s, i, u) { var _ = !1, @@ -24848,11 +24842,11 @@ (s.sibling = null), 5 === s.tag && null !== (i = s.stateNode) && - (delete i[gn], - delete i[yn], - delete i[vn], - delete i[_n], - delete i[wn]), + (delete i[gn], + delete i[yn], + delete i[vn], + delete i[_n], + delete i[wn]), (s.stateNode = null), (s.return = null), (s.dependencies = null), @@ -24963,8 +24957,7 @@ case 15: if ( !Po && - null !== (_ = u.updateQueue) && - null !== (_ = _.lastEffect) + null !== (_ = u.updateQueue) && null !== (_ = _.lastEffect) ) { w = _ = _.next; do { @@ -25700,8 +25693,7 @@ return !0; })(w) && (2 === (i = Jk(s, _)) && - 0 !== (x = xc(s)) && - ((_ = x), (i = Ok(s, x))), + 0 !== (x = xc(s)) && ((_ = x), (i = Ok(s, x))), 1 === i)) ) throw ((u = Go), Lk(s, 0), Dk(s, _), Ek(s, yt()), u); @@ -28117,8 +28109,7 @@ return ( void 0 !== this._readableState && void 0 !== this._writableState && - this._readableState.destroyed && - this._writableState.destroyed + this._readableState.destroyed && this._writableState.destroyed ); }, set: function set(s) { @@ -29144,8 +29135,7 @@ return ( !!$.call(this, s) || (this === Writable && - s && - s._writableState instanceof WritableState) + s && s._writableState instanceof WritableState) ); } })) @@ -33569,8 +33559,7 @@ j = s; if ( "object" == typeof s && - (j = s[(_ = Object.keys(s)[0])]) && - j._elem + (j = s[(_ = Object.keys(s)[0])]) && j._elem ) return ( (j._elem.name = _), @@ -46154,11 +46143,10 @@ !!Jl(s) || (!!s && "object" == typeof s && - !_isString(s) && - (0 === s.length || - (s.length > 0 && - s.hasOwnProperty(0) && - s.hasOwnProperty(s.length - 1)))) + !_isString(s) && + (0 === s.length || + (s.length > 0 && + s.hasOwnProperty(0) && s.hasOwnProperty(s.length - 1)))) ); }); var sc = "undefined" != typeof Symbol ? Symbol.iterator : "@@iterator"; @@ -47707,8 +47695,10 @@ ? !(!s || "object" != typeof s || "string" != typeof s.uri) : ("undefined" != typeof File && s instanceof File) || ("undefined" != typeof Blob && s instanceof Blob) || - !!ArrayBuffer.isView(s) || - (null !== s && "object" == typeof s && "function" == typeof s.pipe) + !!ArrayBuffer.isView(s) || + (null !== s && + "object" == typeof s && + "function" == typeof s.pipe) ); } function isArrayOfFile(s, i) { @@ -48207,8 +48197,7 @@ "object" == typeof i && null !== i && "primitive" in i && - "function" == typeof i.primitive && - i.primitive() === s, + "function" == typeof i.primitive && i.primitive() === s, hasClass = (s, i) => "object" == typeof i && null !== i && @@ -57600,12 +57589,12 @@ const parameterEquals = (i, u) => !!s.isParameterElement(i) && !!s.isParameterElement(u) && - !!s.isStringElement(i.name) && - !!s.isStringElement(i.in) && - !!s.isStringElement(u.name) && - !!s.isStringElement(u.in) && - serializers_value(i.name) === serializers_value(u.name) && - serializers_value(i.in) === serializers_value(u.in), + !!s.isStringElement(i.name) && + !!s.isStringElement(i.in) && + !!s.isStringElement(u.name) && + !!s.isStringElement(u.in) && + serializers_value(i.name) === serializers_value(u.name) && + serializers_value(i.in) === serializers_value(u.in), i = []; return { visitor: { @@ -61255,18 +61244,20 @@ He.createElement( "div", { className: "modal-ux-content" }, - j.valueSeq().map((j, B) => - He.createElement(P, { - key: B, - AST: x, - definitions: j, - getComponent: u, - errSelectors: _, - authSelectors: s, - authActions: i, - specSelectors: w - }) - ) + j + .valueSeq() + .map((j, B) => + He.createElement(P, { + key: B, + AST: x, + definitions: j, + getComponent: u, + errSelectors: _, + authSelectors: s, + authActions: i, + specSelectors: w + }) + ) ) ) ) @@ -64928,22 +64919,26 @@ ")" ), Z && et.size - ? et.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + ? et + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) : null, X && tt.size - ? tt.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - xKey: s, - xVal: i - }) - ) + ? tt + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + xKey: s, + xVal: i + }) + ) : null ), He.createElement( @@ -67257,14 +67252,16 @@ He.createElement("span", { className: "brace-close" }, "}") ), ye.size - ? ye.entrySeq().map(([s, i]) => - He.createElement(Re, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: "property" - }) - ) + ? ye + .entrySeq() + .map(([s, i]) => + He.createElement(Re, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: "property" + }) + ) : null ); } @@ -67433,24 +67430,28 @@ ")" ), ae.size - ? ae.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: eI - }) - ) + ? ae + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: eI + }) + ) : null, P && ee.size - ? ee.entrySeq().map(([s, i]) => - He.createElement(de, { - key: `${s}-${i}`, - propKey: s, - propVal: i, - propClass: eI - }) - ) + ? ee + .entrySeq() + .map(([s, i]) => + He.createElement(de, { + key: `${s}-${i}`, + propKey: s, + propVal: i, + propClass: eI + }) + ) : null, Z ? He.createElement(ce, { source: Z }) : null, ie && @@ -67778,13 +67779,12 @@ return ( !(s >= 55296 && s <= 57343) && !(s >= 64976 && s <= 65007) && - 65535 != (65535 & s) && - 65534 != (65535 & s) && - !(s >= 0 && s <= 8) && - 11 !== s && - !(s >= 14 && s <= 31) && - !(s >= 127 && s <= 159) && - !(s > 1114111) + 65535 != (65535 & s) && + 65534 != (65535 & s) && + !(s >= 0 && s <= 8) && + 11 !== s && + !(s >= 14 && s <= 31) && + !(s >= 127 && s <= 159) && !(s > 1114111) ); } function fromCodePoint(s) { @@ -69288,36 +69288,36 @@ return ( P !== $ + 2 && !(P + 1 >= U || 58 !== s.src.charCodeAt(++P)) && - (_ || - (P++, - s.env.footnotes || (s.env.footnotes = {}), - s.env.footnotes.refs || (s.env.footnotes.refs = {}), - (B = s.src.slice($ + 2, P - 2)), - (s.env.footnotes.refs[":" + B] = -1), - s.tokens.push({ - type: "footnote_reference_open", - label: B, - level: s.level++ - }), - (w = s.bMarks[i]), - (x = s.tShift[i]), - (j = s.parentType), - (s.tShift[i] = s.skipSpaces(P) - P), - (s.bMarks[i] = P), - (s.blkIndent += 4), - (s.parentType = "footnote"), - s.tShift[i] < s.blkIndent && - ((s.tShift[i] += s.blkIndent), (s.bMarks[i] -= s.blkIndent)), - s.parser.tokenize(s, i, u, !0), - (s.parentType = j), - (s.blkIndent -= 4), - (s.tShift[i] = x), - (s.bMarks[i] = w), - s.tokens.push({ - type: "footnote_reference_close", - level: --s.level - })), - !0) + (_ || + (P++, + s.env.footnotes || (s.env.footnotes = {}), + s.env.footnotes.refs || (s.env.footnotes.refs = {}), + (B = s.src.slice($ + 2, P - 2)), + (s.env.footnotes.refs[":" + B] = -1), + s.tokens.push({ + type: "footnote_reference_open", + label: B, + level: s.level++ + }), + (w = s.bMarks[i]), + (x = s.tShift[i]), + (j = s.parentType), + (s.tShift[i] = s.skipSpaces(P) - P), + (s.bMarks[i] = P), + (s.blkIndent += 4), + (s.parentType = "footnote"), + s.tShift[i] < s.blkIndent && + ((s.tShift[i] += s.blkIndent), (s.bMarks[i] -= s.blkIndent)), + s.parser.tokenize(s, i, u, !0), + (s.parentType = j), + (s.blkIndent -= 4), + (s.tShift[i] = x), + (s.bMarks[i] = w), + s.tokens.push({ + type: "footnote_reference_close", + level: --s.level + })), + !0) ); }, ["paragraph"] @@ -69376,32 +69376,32 @@ return ( !(j >= u) && !(s.tShift[j] < s.blkIndent) && - !(s.tShift[j] - s.blkIndent > 3) && - !((w = s.bMarks[j] + s.tShift[j]) >= (x = s.eMarks[j])) && - (45 === (_ = s.src.charCodeAt(w)) || 61 === _) && - ((w = s.skipChars(w, _)), - !((w = s.skipSpaces(w)) < x) && - ((w = s.bMarks[i] + s.tShift[i]), - (s.line = j + 1), - s.tokens.push({ - type: "heading_open", - hLevel: 61 === _ ? 1 : 2, - lines: [i, s.line], - level: s.level - }), - s.tokens.push({ - type: "inline", - content: s.src.slice(w, s.eMarks[i]).trim(), - level: s.level + 1, - lines: [i, s.line - 1], - children: [] - }), - s.tokens.push({ - type: "heading_close", - hLevel: 61 === _ ? 1 : 2, - level: s.level - }), - !0)) + !(s.tShift[j] - s.blkIndent > 3) && + !((w = s.bMarks[j] + s.tShift[j]) >= (x = s.eMarks[j])) && + (45 === (_ = s.src.charCodeAt(w)) || 61 === _) && + ((w = s.skipChars(w, _)), + !((w = s.skipSpaces(w)) < x) && + ((w = s.bMarks[i] + s.tShift[i]), + (s.line = j + 1), + s.tokens.push({ + type: "heading_open", + hLevel: 61 === _ ? 1 : 2, + lines: [i, s.line], + level: s.level + }), + s.tokens.push({ + type: "inline", + content: s.src.slice(w, s.eMarks[i]).trim(), + level: s.level + 1, + lines: [i, s.line - 1], + children: [] + }), + s.tokens.push({ + type: "heading_close", + hLevel: 61 === _ ? 1 : 2, + level: s.level + }), + !0)) ); } ], @@ -70516,27 +70516,27 @@ return ( !(P + 2 >= j) && 94 === s.src.charCodeAt(P) && - 91 === s.src.charCodeAt(P + 1) && - !(s.level >= s.options.maxNesting) && - ((u = P + 2), - !((_ = parseLinkLabel(s, P + 1)) < 0) && - (i || - (s.env.footnotes || (s.env.footnotes = {}), - s.env.footnotes.list || (s.env.footnotes.list = []), - (w = s.env.footnotes.list.length), - (s.pos = u), - (s.posMax = _), - s.push({ type: "footnote_ref", id: w, level: s.level }), - s.linkLevel++, - (x = s.tokens.length), - s.parser.tokenize(s), - (s.env.footnotes.list[w] = { - tokens: s.tokens.splice(x) - }), - s.linkLevel--), - (s.pos = _ + 1), - (s.posMax = j), - !0)) + 91 === s.src.charCodeAt(P + 1) && + !(s.level >= s.options.maxNesting) && + ((u = P + 2), + !((_ = parseLinkLabel(s, P + 1)) < 0) && + (i || + (s.env.footnotes || (s.env.footnotes = {}), + s.env.footnotes.list || (s.env.footnotes.list = []), + (w = s.env.footnotes.list.length), + (s.pos = u), + (s.posMax = _), + s.push({ type: "footnote_ref", id: w, level: s.level }), + s.linkLevel++, + (x = s.tokens.length), + s.parser.tokenize(s), + (s.env.footnotes.list[w] = { + tokens: s.tokens.splice(x) + }), + s.linkLevel--), + (s.pos = _ + 1), + (s.posMax = j), + !0)) ); } ], @@ -70562,27 +70562,27 @@ return ( _ !== P + 2 && !(_ >= j) && - (_++, - (u = s.src.slice(P + 2, _ - 1)), - void 0 !== s.env.footnotes.refs[":" + u] && - (i || - (s.env.footnotes.list || (s.env.footnotes.list = []), - s.env.footnotes.refs[":" + u] < 0 - ? ((w = s.env.footnotes.list.length), - (s.env.footnotes.list[w] = { label: u, count: 0 }), - (s.env.footnotes.refs[":" + u] = w)) - : (w = s.env.footnotes.refs[":" + u]), - (x = s.env.footnotes.list[w].count), - s.env.footnotes.list[w].count++, - s.push({ - type: "footnote_ref", - id: w, - subId: x, - level: s.level - })), - (s.pos = _), - (s.posMax = j), - !0)) + (_++, + (u = s.src.slice(P + 2, _ - 1)), + void 0 !== s.env.footnotes.refs[":" + u] && + (i || + (s.env.footnotes.list || (s.env.footnotes.list = []), + s.env.footnotes.refs[":" + u] < 0 + ? ((w = s.env.footnotes.list.length), + (s.env.footnotes.list[w] = { label: u, count: 0 }), + (s.env.footnotes.refs[":" + u] = w)) + : (w = s.env.footnotes.refs[":" + u]), + (x = s.env.footnotes.list[w].count), + s.env.footnotes.list[w].count++, + s.push({ + type: "footnote_ref", + id: w, + subId: x, + level: s.level + })), + (s.pos = _), + (s.posMax = j), + !0)) ); } ], @@ -70598,25 +70598,25 @@ return ( 60 === s.src.charCodeAt(P) && !((u = s.src.slice(P)).indexOf(">") < 0) && - ((_ = u.match(NI)) - ? !(II.indexOf(_[1].toLowerCase()) < 0) && - ((j = normalizeLink((x = _[0].slice(1, -1)))), - !!s.parser.validateLink(x) && - (i || - (s.push({ type: "link_open", href: j, level: s.level }), - s.push({ type: "text", content: x, level: s.level + 1 }), - s.push({ type: "link_close", level: s.level })), - (s.pos += _[0].length), - !0)) - : !!(w = u.match(PI)) && - ((j = normalizeLink("mailto:" + (x = w[0].slice(1, -1)))), - !!s.parser.validateLink(j) && - (i || - (s.push({ type: "link_open", href: j, level: s.level }), - s.push({ type: "text", content: x, level: s.level + 1 }), - s.push({ type: "link_close", level: s.level })), - (s.pos += w[0].length), - !0))) + ((_ = u.match(NI)) + ? !(II.indexOf(_[1].toLowerCase()) < 0) && + ((j = normalizeLink((x = _[0].slice(1, -1)))), + !!s.parser.validateLink(x) && + (i || + (s.push({ type: "link_open", href: j, level: s.level }), + s.push({ type: "text", content: x, level: s.level + 1 }), + s.push({ type: "link_close", level: s.level })), + (s.pos += _[0].length), + !0)) + : !!(w = u.match(PI)) && + ((j = normalizeLink("mailto:" + (x = w[0].slice(1, -1)))), + !!s.parser.validateLink(j) && + (i || + (s.push({ type: "link_open", href: j, level: s.level }), + s.push({ type: "text", content: x, level: s.level + 1 }), + s.push({ type: "link_close", level: s.level })), + (s.pos += w[0].length), + !0))) ); } ], @@ -70640,15 +70640,15 @@ return i >= 97 && i <= 122; })(u) ) && - !!(_ = s.src.slice(x).match(DI)) && - (i || - s.push({ - type: "htmltag", - content: s.src.slice(x, x + _[0].length), - level: s.level - }), - (s.pos += _[0].length), - !0)) + !!(_ = s.src.slice(x).match(DI)) && + (i || + s.push({ + type: "htmltag", + content: s.src.slice(x, x + _[0].length), + level: s.level + }), + (s.pos += _[0].length), + !0)) ); } ], @@ -71740,7 +71740,7 @@ return ( !(!s || !i) && !this.hasFullProtocolRegex.test(i) && - !this.hasWordCharAfterProtocolRegex.test(s) + !this.hasWordCharAfterProtocolRegex.test(s) ); }), (UrlMatchValidator.hasFullProtocolRegex = /^[A-Za-z][-.+A-Za-z0-9]*:\/\//), @@ -74095,17 +74095,19 @@ ? He.createElement( "select", { "data-variable": s, onChange: $ }, - u.get("enum").map(u => - He.createElement( - "option", - { - selected: u === w(i, s), - key: u, - value: u - }, - u + u + .get("enum") + .map(u => + He.createElement( + "option", + { + selected: u === w(i, s), + key: u, + value: u + }, + u + ) ) - ) ) : He.createElement("input", { type: "text", diff --git a/pandora_console/api/documentation/swagger-ui-standalone-preset.js b/pandora_console/api/documentation/swagger-ui-standalone-preset.js index 0c1f324ddd..5a7d464c49 100644 --- a/pandora_console/api/documentation/swagger-ui-standalone-preset.js +++ b/pandora_console/api/documentation/swagger-ui-standalone-preset.js @@ -6859,9 +6859,7 @@ null != e && !i(e) ) || - a.test(e) || - !o.test(e) || - (null != t && e in Object(t)) + a.test(e) || !o.test(e) || (null != t && e in Object(t)) ); }; }, diff --git a/pandora_console/api/documentation/swagger-ui.js b/pandora_console/api/documentation/swagger-ui.js index ae78269ee4..c72fd6d40e 100644 --- a/pandora_console/api/documentation/swagger-ui.js +++ b/pandora_console/api/documentation/swagger-ui.js @@ -4819,18 +4819,20 @@ k().createElement( "div", { className: "modal-ux-content" }, - o.valueSeq().map((o, c) => - k().createElement(l, { - key: c, - AST: s, - definitions: o, - getComponent: r, - errSelectors: a, - authSelectors: e, - authActions: t, - specSelectors: n - }) - ) + o + .valueSeq() + .map((o, c) => + k().createElement(l, { + key: c, + AST: s, + definitions: o, + getComponent: r, + errSelectors: a, + authSelectors: e, + authActions: t, + specSelectors: n + }) + ) ) ) ) @@ -7256,13 +7258,15 @@ k().createElement( "tbody", null, - e.entrySeq().map(([e, t]) => - k().createElement(r, { - key: `${e}-${t}`, - xKey: e, - xVal: t - }) - ) + e + .entrySeq() + .map(([e, t]) => + k().createElement(r, { + key: `${e}-${t}`, + xKey: e, + xVal: t + }) + ) ) ) ) @@ -7694,13 +7698,15 @@ k().createElement(C, { source: a.get("description") }) ), y && f.size - ? f.entrySeq().map(([e, t]) => - k().createElement(_, { - key: `${e}-${t}`, - xKey: e, - xVal: t - }) - ) + ? f + .entrySeq() + .map(([e, t]) => + k().createElement(_, { + key: `${e}-${t}`, + xKey: e, + xVal: t + }) + ) : null, g && a.get("content") ? k().createElement( @@ -10810,14 +10816,16 @@ k().createElement("span", { className: "brace-close" }, "}") ), w.size - ? w.entrySeq().map(([e, t]) => - k().createElement(j, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: "property" - }) - ) + ? w + .entrySeq() + .map(([e, t]) => + k().createElement(j, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: "property" + }) + ) : null ); } @@ -10874,14 +10882,16 @@ { title: E, expanded: a <= n, collapsedContent: "[...]" }, "[", m.size - ? m.entrySeq().map(([e, t]) => - k().createElement(f, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: "property" - }) - ) + ? m + .entrySeq() + .map(([e, t]) => + k().createElement(f, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: "property" + }) + ) : null, c ? k().createElement(h, { source: c }) @@ -10998,24 +11008,28 @@ ")" ), g.size - ? g.entrySeq().map(([e, t]) => - k().createElement(_, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: ln - }) - ) + ? g + .entrySeq() + .map(([e, t]) => + k().createElement(_, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: ln + }) + ) : null, l && h.size - ? h.entrySeq().map(([e, t]) => - k().createElement(_, { - key: `${e}-${t}`, - propKey: e, - propVal: t, - propClass: ln - }) - ) + ? h + .entrySeq() + .map(([e, t]) => + k().createElement(_, { + key: `${e}-${t}`, + propKey: e, + propVal: t, + propClass: ln + }) + ) : null, d ? k().createElement(S, { source: d }) : null, y && @@ -12438,13 +12452,15 @@ ")" ), C && i.size - ? i.entrySeq().map(([e, r]) => - k().createElement(t, { - key: `${e}-${r}`, - xKey: e, - xVal: r - }) - ) + ? i + .entrySeq() + .map(([e, r]) => + k().createElement(t, { + key: `${e}-${r}`, + xKey: e, + xVal: r + }) + ) : null ), k().createElement( @@ -12687,17 +12703,19 @@ ? k().createElement( "select", { "data-variable": e, onChange: i }, - r.get("enum").map(r => - k().createElement( - "option", - { - selected: r === n(t, e), - key: r, - value: r - }, - r + r + .get("enum") + .map(r => + k().createElement( + "option", + { + selected: r === n(t, e), + key: r, + value: r + }, + r + ) ) - ) ) : k().createElement("input", { type: "text", @@ -17481,8 +17499,7 @@ const { examples: t, example: r, default: a } = e; return ( !!(Array.isArray(t) && t.length >= 1) || - void 0 !== a || - void 0 !== r + void 0 !== a || void 0 !== r ); }, extractExample = e => { From 2150272903587054e9bf56719fe8e7806ccf15dd Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 25 Mar 2024 15:59:41 +0100 Subject: [PATCH 5/5] #11634 deleted ha legacy from backend --- pandora_server/conf/pandora_server.conf.new | 3 - pandora_server/lib/PandoraFMS/Config.pm | 6 -- pandora_server/util/pandora_ha.pl | 90 +-------------------- 3 files changed, 1 insertion(+), 98 deletions(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 48c6c6288d..8dcb2ee0f4 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -714,9 +714,6 @@ ncm_ssh_utility /usr/share/pandora_server/util/ncm_ssh_extension # Pandora FMS Daemon Watchdog execution interval in seconds (PANDORA FMS ENTERPRISE ONLY). ha_interval 30 -# HA operation mode. For backward compatibility with pacemaker. Do not change this value (PANDORA FMS ENTERPRISE ONLY). -ha_mode pandora - # Comma separated list of HA host IPs or FQDNs (PANDORA FMS ENTERPRISE ONLY). #ha_hosts 172.16.0.8,172.168.0.16 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index eebf94fdf6..98c97f3f4c 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -566,7 +566,6 @@ sub pandora_load_config { $pa_config->{"netflowserver"} = 0; # 7.0.770 $pa_config->{"netflowserver_threads"} = 1; # 7.0.770 - $pa_config->{"ha_mode"} = "pacemaker"; # 7.0.770 $pa_config->{"ha_file"} = undef; # 7.0.770 $pa_config->{"ha_hosts_file"} = '/var/spool/pandora/data_in/conf/pandora_ha_hosts.conf'; # 7.0.770 $pa_config->{"ha_connect_retries"} = 2; # 7.0.770 @@ -1338,11 +1337,6 @@ sub pandora_load_config { elsif ($parametro =~ m/^ncm_ssh_utility\s+(.*)/i) { $pa_config->{'ncm_ssh_utility'}= clean_blank($1); } - - # Pandora HA extra - elsif ($parametro =~ m/^ha_mode\s(.*)/i) { - $pa_config->{'ha_mode'} = clean_blank($1); - } elsif ($parametro =~ m/^ha_file\s(.*)/i) { $pa_config->{'ha_file'} = clean_blank($1); } diff --git a/pandora_server/util/pandora_ha.pl b/pandora_server/util/pandora_ha.pl index 28ae0df795..57b2de44b5 100755 --- a/pandora_server/util/pandora_ha.pl +++ b/pandora_server/util/pandora_ha.pl @@ -539,89 +539,6 @@ sub ha_restart_pandora($) { `$config->{'pandora_service_cmd'} $control_command 2>/dev/null`; } -############################################################################### -# Main (Pacemaker) -############################################################################### -sub ha_main_pacemaker($) { - my ($conf) = @_; - - # Set the PID file. - $conf->{'PID'} = $PID_FILE; - - # Log to a separate file if needed. - $conf->{'log_file'} = $conf->{'ha_log_file'} if defined ($conf->{'ha_log_file'}); - - $Running = 1; - - ha_daemonize($conf) if ($DAEMON == 1); - - while ($Running) { - eval { - eval { - local $SIG{__DIE__}; - # Load enterprise components. - enterprise_load($conf, 1); - - # Register Enterprise logger - enterprise_hook('pandoraha_logger', [\&log_message]); - log_message($conf, 'LOG', 'Enterprise capabilities loaded'); - - }; - if ($@) { - # No enterprise capabilities. - log_message($conf, 'LOG', 'No enterprise capabilities'); - } - - # Start the Pandora FMS server if needed. - log_message($conf, 'LOG', 'Checking the pandora_server service.'); - - # Connect to a DB. - my $dbh = ha_database_connect($conf); - - if ($First_Cleanup == 1) { - log_message($conf, 'LOG', 'Cleaning previous unfinished actions'); - enterprise_hook('pandoraha_cleanup_states', [$conf, $dbh]); - $First_Cleanup = 0; - } - - # Check if there are updates pending. - ha_update_server($conf, $dbh); - - # Keep pandora running - ha_keep_pandora_running($conf, $dbh); - - # Keep Tentacle running - ha_keep_tentacle_running($conf, $dbh); - - # Keep MADE running - ha_keep_made_running($conf, $dbh); - - # Are we the master? - pandora_set_master($conf, $dbh); - if (!pandora_is_master($conf)) { - log_message($conf, 'LOG', $conf->{'servername'} . ' is not the current master. Skipping DB-HA actions and monitoring.'); - # Exit current eval. - return; - } - - # Synchronize database. - enterprise_hook('pandoraha_sync_node', [$conf, $dbh]); - - # Monitoring. - enterprise_hook('pandoraha_monitoring', [$conf, $dbh]); - - # Pending actions. - enterprise_hook('pandoraha_process_queue', [$conf, $dbh, $First_Cleanup]); - - # Cleanup and exit - db_disconnect ($dbh); - }; - log_message($conf, 'WARNING', $@) if ($@); - - log_message($conf, 'LOG', "Sleep."); - sleep($conf->{'ha_interval'}); - } -} ############################################################################### # Main (Pandora) @@ -763,11 +680,6 @@ ha_init_pandora(\%Conf); # Read config file ha_load_pandora_conf (\%Conf); -# Main -if (defined($Conf{'ha_mode'}) && lc($Conf{'ha_mode'}) eq 'pandora') { - ha_main_pandora(\%Conf); -} else { - ha_main_pacemaker(\%Conf); -} +ha_main_pandora(\%Conf); exit 0;