release v0.0.7

Author: Boris

front/index.html

@@ -62,7 +62,7 @@ <h1 class="my-4">Snapshots list
         </h1>
 
         <div class="d-flex align-items-center invisible" id="loading"><strong>Loading...</strong><div class="spinner-border ml-auto" role="status" aria-hidden="true"></div></div>
-        <ul class="list-unstyled mb-0" id="snapshotlist"> </ul>
+        <ul class="list-unstyled mb-0 overflow-auto" style="max-height: 800px;" id="snapshotlist"> </ul>
 
       </div>       
 
@@ -347,14 +347,17 @@ <h5 class="modal-title" id="exampleModalLabel">X-tract indices from snapshot</h5
       dataType: 'json',
       contentType: 'application/json',
       success: function (data) {
-        $("#result").html('<div class="alert alert-success alert-dismissible fade show">Index restored.<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+        if ( data.error == 0 ) {
+          $("#result").html('<div class="alert alert-success alert-dismissible fade show">'+data.message+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+        } else {
+          $("#result").html('<div class="alert alert-danger alert-dismissible fade show">'+data.message+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>')
+        }
       },
       error: function (data) {
-        console.log("error",data.responseJSON)
-        $("#result").html('<div class="alert alert-danger alert-dismissible fade show">'+data.responseJSON.error+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>')
+        $("#result").html('<div class="alert alert-danger alert-dismissible fade show">'+data.responseJSON.message+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>')
       }
     });
-  event.preventDefault();
+    event.preventDefault();
 });
 
 $('#update_instance').on('hidden.bs.modal',function(){

mock/queries.txt

@@ -105,13 +105,59 @@ POST /_snapshot/my_repository/snapshot_2/_restore?wait_for_completion=false
 
 curl  "http://localhost:9200/_snapshot/s3-backup/mp-2020.11.02/_restore?wait_for_completion=false" -H "Content-type: application/json" -d'
 {
-  "indices": "mp-2020.11.01",
-  "ignore_unavailable": true,
-  "include_global_state": false,
-  "rename_pattern": "(.+)",
-  "rename_replacement": "restored_$1",
-  "include_aliases": false
+  "indices": "boris,filebeat-2020.10.10",   "ignore_unavailable": true,   "include_global_state": false,   "rename_pattern": "(.+)",   "rename_replacement": "restored_$1",   "include_aliases": false
 }'
 
+curl -ks https://opendistro:9200/_cat/indices/restored*?health=green
+
+			for _, iname := range request.Values.Indices {
+				ind := snap_status.Snapshots[0].Indices[iname]
+
+				if ind.ShardsStats.Total == 1 {
+					if ind.Stats.Total.Size < rt.nodes.max {
+
+						req := map[string]interface{}{
+							"ignore_unavailable":   false,
+							"include_global_state": false,
+							"include_aliases":      false,
+							"rename_pattern":       "(.+)",
+							"rename_replacement":   "restored_$1",
+							"indices":              request.Values.Indices,
+							"index_settings":       map[string]interface{}{"index.number_of_replicas": 0},
+						}
+
+						response, err := rt.doPost(rt.conf.Elastic.Host+"_snapshot/"+request.Values.Repo+"/"+request.Values.Snapshot+"/_restore?wait_for_completion=false", req)
+						if err != nil {
+							http.Error(w, err.Error(), 500)
+							log.Println(remoteIP, "\t", r.Method, "\t", r.URL.Path, "\t", request.Action, "\t", 500, "\t", err.Error(), "\t", r.UserAgent())
+							return
+						}
+						w.Write(response)
+
+					} else {
+						msg := fmt.Sprintf("{\"error\":\"Restore index '%s' failed with: Not enough space\"}", iname)
+						http.Error(w, msg, 600)
+						log.Println(request.Action, "\t", 600, "\t", "Restore index '", iname, "' failed with: not enough space")
+						return
+					}
+				} else { // индексы с snapshots >1 - пока восстанавливаем без проверок
+					req := map[string]interface{}{
+						"ignore_unavailable":   false,
+						"include_global_state": false,
+						"include_aliases":      false,
+						"rename_pattern":       "(.+)",
+						"rename_replacement":   "restored_$1",
+						"indices":              request.Values.Indices,
+						"index_settings":       map[string]interface{}{"index.number_of_replicas": 0},
+					}
 
+					response, err := rt.doPost(rt.conf.Elastic.Host+"_snapshot/"+request.Values.Repo+"/"+request.Values.Snapshot+"/_restore?wait_for_completion=false", req)
+					if err != nil {
+						http.Error(w, err.Error(), 500)
+						log.Println(remoteIP, "\t", r.Method, "\t", r.URL.Path, "\t", request.Action, "\t", 500, "\t", err.Error(), "\t", r.UserAgent())
+						return
+					}
+					w.Write(response)
+				}
 
+			} // end for