JE-71293

backup.jps

@@ -5,7 +5,7 @@ id: db-backup
 targetEditions: any
 logo: /images/backup-logo.png
 description: Backup Add-On for the database. It can be used to create scheduled backups according to any required timezone and restore corrupted databases, even if the content has been completely deleted.
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/database-backup-addon/master
+baseUrl: https://raw.githubusercontent.com/sych74/database-backup-addon/pitr
 
 targetNodes:
   nodeType: 
@@ -144,6 +144,26 @@ settings:
         tooltip: "Always unmount backup storage when backup/restore is finished." 
         value: false
         hidden: false
+      - type: toggle
+        name: isPitr
+        caption: PITR
+        tooltip: "Point in time recovery" 
+        value: false
+        hidden: false
+        showIf:
+          true:
+          - type: displayfield
+            cls: warning
+            height: 30,
+            hideLabel: true,
+            markup: "Database doesnt configured for PITR support. Please push apply for automatic configuring or close and manually configure acording to instruction and reinstall addon"          
+
+      - type: displayfield
+        name: displayPitr
+        markup: ""
+        hidden: true
+        hideLabel: true
+        cls: warning
       - type: displayfield
         name: displayfield
         markup: Please specify the database user that has enough privileges to access and modify all the databases stored on server. Username and password are required for all the DB servers except Redis.
@@ -155,18 +175,228 @@ settings:
         type: string
         caption: Database User
         name: dbuser
+        default: root
         tooltip: In case you restore non-native database backup do not forget to provide its credentials instead of initial ones with help of add-on Configure action. It is relevant to <b>sqldb</b> databases and <b>MongoDB</b> only.
       - hideLabel: false
         hidden: false
         type: string
         inputType: password
         caption: Database Password
+        default: IBOkks15239
         name: dbpass
     onBeforeInit: scripts/configOnBeforeInit.js
 
   restore:
     fields: []
-    onBeforeInit: scripts/restoreOnBeforeInit.js
+    onBeforeInit: |
+      import org.json.JSONObject;
+      var storage_unavailable_markup = "";
+      var storageInfo = getStorageNodeid();
+      var storageEnvDomain = storageInfo.storageEnvShortName;
+      var storageEnvMasterId = storageInfo.storageNodeId;
+      var checkSchemaCommand = "if grep -q '^SCHEME=' /.jelenv; then echo true; else echo false; fi";
+      var mysql_cluster_markup = "Be careful when restoring the dump from another DB environment (or environment with another replication schema) to the replicated MySQL/MariaDB/Percona solution.";
+      var recovery_addon_markup = "Please use Database Corruption Diagnostic add-on for check after restore, and Database Recovery Add-on for fix if it is needed.";
+
+      resp = jelastic.env.control.GetEnvInfo(storageEnvDomain, session);
+      if (resp.result != 0 && resp.result != 11) return resp;
+      if (resp.result == 11) {
+          storage_unavailable_markup = "Storage environment " + "${settings.storageName}" + " is deleted.";
+      } else if (resp.env.status == 1) {
+          var baseUrl = jps.baseUrl;
+          var updateResticOnStorageCommand = "wget --tries=10 -O /tmp/installUpdateRestic " + baseUrl + "/scripts/installUpdateRestic && mv -f /tmp/installUpdateRestic /usr/sbin/installUpdateRestic && chmod +x /usr/sbin/installUpdateRestic && /usr/sbin/installUpdateRestic";
+          var respUpdate = api.env.control.ExecCmdById(storageEnvDomain, session, storageEnvMasterId, toJSON([{"command": updateResticOnStorageCommand, "params": ""}]), false, "root");
+          if (respUpdate.result != 0) return respUpdate;
+          var backups = jelastic.env.control.ExecCmdById(storageEnvDomain, session, storageEnvMasterId, toJSON([{"command": "/root/getBackupsAllEnvs.sh", "params": ""}]), false, "root").responses[0].out;
+          var backupList = toNative(new JSONObject(String(backups)));
+          var envs = prepareEnvs(backupList.envs);
+          var backups = prepareBackups(backupList.backups);
+      } else {
+          storage_unavailable_markup = "Storage environment " + storageEnvDomain + " is unavailable (stopped/sleeping).";
+      }
+
+      var checkSchema = api.env.control.ExecCmdById("${env.name}", session, ${targetNodes.master.id}, toJSON([{"command": checkSchemaCommand, "params": ""}]), false, "root");
+      if (checkSchema.result != 0) return checkSchema;
+
+      function getStorageNodeid(){
+          var storageEnv = '${settings.storageName}'
+          var storageEnvShortName = storageEnv.split(".")[0]
+          var resp = jelastic.environment.control.GetEnvInfo(storageEnvShortName, session)
+          if (resp.result != 0) return resp
+          for (var i = 0; resp.nodes; i++) {
+              var node = resp.nodes[i]
+              if (node.nodeGroup == 'storage' && node.ismaster) {
+                  return { result: 0, storageNodeId: node.id, storageEnvShortName: storageEnvShortName };
+              }
+          }
+      }
+
+      function prepareEnvs(values) {
+          var aResultValues = [];
+
+          values = values || [];
+
+          for (var i = 0, n = values.length; i < n; i++) {
+              aResultValues.push({ caption: values[i], value: values[i] });
+          }
+
+          return aResultValues;
+      }
+
+      function prepareBackups(backups) {
+          var oResultBackups = {};
+          var aValues;
+
+          for (var envName in backups) {
+              if (Object.prototype.hasOwnProperty.call(backups, envName)) {
+                  aValues = [];
+
+                  for (var i = 0, n = backups[envName].length; i < n; i++) {
+                      aValues.push({ caption: backups[envName][i], value: backups[envName][i] });
+                  }
+
+                  oResultBackups[envName] = aValues;
+              }
+          }
+
+          return oResultBackups;
+      }
+
+      if (storage_unavailable_markup === "") {
+          if ('${settings.isPitr}' == 'true') {
+              settings.fields.push({
+                  "type": "toggle",
+                  "name": "isPitr",
+                  "caption": "PITR",
+                  "tooltip": "Point in time recovery",
+                  "value": true,
+                  "hidden": false,
+                  "showIf": {
+                    "true": [
+                     {
+                          "caption": "Restore from",
+                          "type": "list",
+                          "name": "backupedEnvName",
+                          "required": true,
+                          "values": envs
+                      }, {
+                          "caption": "Time for restore",
+                          "type": "string",
+                          "name": "restoreTime",
+                          "inputType": "datetime-local",
+                          "cls": "x-form-text",
+                          "required": true
+                      }
+                    ],
+                    "false": [
+                     {
+                          "caption": "Restore from",
+                          "type": "list",
+                          "name": "backupedEnvName",
+                          "required": true,
+                          "values": envs
+                      }, {
+                          "caption": "Backup",
+                          "type": "list",
+                          "name": "backupDir",
+                          "required": true,
+                          "tooltip": "Select the time stamp for which you want to restore the DB dump",
+                          "dependsOn": {
+                              "backupedEnvName" : backups
+                          }
+                      }
+                    ]
+                  }
+              });
+              if (checkSchema.responses[0].out == "true") {
+                  settings.fields.push(
+                      {"type": "displayfield", "cls": "warning", "height": 30, "hideLabel": true, "markup": mysql_cluster_markup}
+                  );
+                  settings.fields.push(
+                      {"type": "displayfield", "cls": "warning", "height": 30, "hideLabel": true, "markup": recovery_addon_markup}
+                  );
+              }
+          } else {
+              settings.fields.push({
+                  "caption": "Restore from",
+                  "type": "list",
+                  "name": "backupedEnvName",
+                  "required": true,
+                  "values": envs
+              }, {
+                  "caption": "Backup",
+                  "type": "list",
+                  "name": "backupDir",
+                  "required": true,
+                  "tooltip": "Select the time stamp for which you want to restore the DB dump",
+                  "dependsOn": {
+                      "backupedEnvName" : backups
+                  }
+              });
+              if (checkSchema.responses[0].out == "true") {
+                  settings.fields.push(
+                      {"type": "displayfield", "cls": "warning", "height": 30, "hideLabel": true, "markup": mysql_cluster_markup}
+                  );
+                  settings.fields.push(
+                      {"type": "displayfield", "cls": "warning", "height": 30, "hideLabel": true, "markup": recovery_addon_markup}
+                  );
+              }
+          }
+      } else {
+          settings.fields.push(
+              {"type": "displayfield", "cls": "warning", "height": 30, "hideLabel": true, "markup": storage_unavailable_markup}
+          )
+      }
+
+      return settings;
+
+  pitr:
+    fields: []
+    onBeforeInit: |
+      var respOut;
+      var pitr_conf_error_markup = "Database doesnt configured for PITR support. Please push apply for automatic configuring or close and manually configure acording to instruction and reinstall addon";
+      var pitr_conf_success_markup = "Database configured for PITR support";
+      var recovery_addon_markup = "Please use Database Corruption Diagnostic add-on for check after restore, and Database Recovery Add-on for fix if it is needed.";
+
+      var checkPitrCmd = "wget " + '${baseUrl}' + "/scripts/pitr.sh -O /root/pitr.sh &>> /var/log/run.log; bash /root/pitr.sh checkPitr " + '${settings.dbuser}' + " " + '${settings.dbpass}';
+      resp = jelastic.env.control.ExecCmdById('${env.envName}', session, '${nodes.sqldb.master.id}', toJSON([{ command: checkPitrCmd }]), true, "root");
+      if (resp.result != 0) return resp;
+      respOut = resp.responses[0].out;
+      respOut = JSON.parse(respOut);
+      if (respOut.result == 702) {
+        settings.fields.push({
+          caption: "PITR",
+          type: "toggle",
+          name: "isPitr",
+          tooltip: "Point in time recovery",
+          values: false,
+          hidden:  false,
+          disabled: true
+        }, {
+          type: "displayfield",
+          cls: "warning",
+          height: 30,
+          hideLabel: true,
+          markup: pitr_conf_error_markup
+        });        
+      } else {
+        settings.fields.push({
+          caption: "PITR",
+          type: "toggle",
+          name: "isPitr",
+          tooltip: "Point in time recovery",
+          values: false,
+          hidden:  false,
+          disabled: false
+        }, {
+          type: "displayfield",
+          cls: "success",
+          height: 30,
+          hideLabel: true,
+          markup: pitr_conf_success_markup
+        });
+      }
+      return settings;
 
 onBeforeInit: scripts/backupOnBeforeInit.js
 
@@ -196,6 +426,7 @@ globals:
   scriptSufix: db-backup
 
 onInstall:
+
   - checkAddons
   - installRestic
   - setSchedule
@@ -281,6 +512,7 @@ actions:
         backupExecNode: ${targetNodes.master.id}
         storageEnv: ${response.storageEnvShortName}
         isAlwaysUmount: ${this.isAlwaysUmount}
+        isPitr: ${this.isPitr}
         nodeGroup: ${this.nodeGroup}
         dbuser: ${this.dbuser}
         dbpass: ${this.dbpass}
@@ -308,10 +540,25 @@ actions:
     - deleteDBdump
 
   restore:
-    - cmd[${targetNodes.nodeGroup}]: |-
-        echo "${settings.backupedEnvName}" > /root/.backupedenv
-        echo "${settings.backupDir}" > /root/.backupid
+    - cmd[${targetNodes.nodeGroup}]: echo "${settings.backupedEnvName}" > /root/.backupedenv
       user: root
+    - if ("${settings.isPitr}" == "true"):
+      - script: |
+          var dateTimeInput = '${settings.restoreTime}';
+          var [date, time] = dateTimeInput.split('T');
+          var formattedDateTime = date + " " + time.slice(0, 5) + ":00";
+          return api.environment.file.Write({ 
+            envName: '${env.envName}',
+            session: session,
+            path: "/root/.backuptime",
+            nodeGroup: "${targetNodes.nodeGroupp}",
+            nodeid: "-1",
+            userName: "root",
+            body: formattedDateTime
+          });
+    - else:
+      - cmd[${targetNodes.nodeGroup}]: echo "${settings.backupDir}" > /root/.backupid;
+        user: root        
     - callScript: restore
     - deleteDBdump
 
@@ -358,6 +605,7 @@ actions:
     - setGlobals: 
         storageEnv: ${settings.storageName}
         isAlwaysUmount: ${settings.isAlwaysUmount}
+        isPitr: ${settings.isPitr}
     - if ("${settings.scheduleType}" == 2):
       - convert
     - else:
@@ -368,14 +616,21 @@ actions:
     - else:
       - removePermanentMount
       - addPermanentMount
+    - if ("${settings.isPitr}" == "true"): setupPitr      
     - installScript:
         cronTime: ${globals.cron}
         backupCount: ${settings.backupCount}
         isAlwaysUmount: ${globals.isAlwaysUmount}
+        isPitr: ${globals.isPitr}
         nodeGroup: ${targetNodes.nodeGroup}
         dbuser: ${settings.dbuser}
         dbpass: ${settings.dbpass}
-
+
+  setupPitr:
+    cmd[${nodes.sqldb.master.id}]: |-
+        wget --tries=10 -O /tmp/pitr.sh ${baseUrl}/scripts/pitr.sh && \
+        chmod +x /tmp/pitr.sh && /tmp/pitr.sh setupPitr ${settings.dbuser} ${settings.dbpass};
+
   addPermanentMount:
     - getStorageCtid
     - script: |