Added code to check capacity of the disk space and compare it to the …

…threshold.Also added a skeleton script.
shapeblue · DaanHoogland · May 17, 2018 · May 17, 2018 · May 17, 2018 · May 23, 2018
commit 2e55ec277d318b9186301d5c492aa9df9362682e
diff --git a/core/src/main/java/com/cloud/agent/api/RetrieveDiagnosticsAnswer.java b/core/src/main/java/com/cloud/agent/api/RetrieveDiagnosticsAnswer.java
@@ -1,22 +1,20 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
-/*
- * // Licensed to the Apache Software Foundation (ASF) under one
- * // or more contributor license agreements.  See the NOTICE file
- * // distributed with this work for additional information
- * // regarding copyright ownership.  The ASF licenses this file
- * // to you under the Apache License, Version 2.0 (the
- * // "License"); you may not use this file except in compliance
- * // with the License.  You may obtain a copy of the License at
- * //
- * //   http://www.apache.org/licenses/LICENSE-2.0
- * //
- * // Unless required by applicable law or agreed to in writing,
- * // software distributed under the License is distributed on an
- * // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * // KIND, either express or implied.  See the License for the
- * // specific language governing permissions and limitations
- * // under the License.
- */
 
 package com.cloud.agent.api;
 

diff --git a/...mework/config/DiagnosticsConfigDepot.java → ...ework/config/DiagnosticsConfigurator.java b/...mework/config/DiagnosticsConfigDepot.java → ...ework/config/DiagnosticsConfigurator.java
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-public interface DiagnosticsConfigDepot {
+public interface DiagnosticsConfigurator {
 
     void set(DiagnosticsKey key, String value);
 

diff --git a/...nfig/impl/DiagnosticsConfigDepotImpl.java → ...fig/impl/DiagnosticsConfiguratorImpl.java b/...nfig/impl/DiagnosticsConfigDepotImpl.java → ...fig/impl/DiagnosticsConfiguratorImpl.java
@@ -17,24 +17,24 @@
 package org.apache.cloudstack.framework.config.impl;
 
 import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.cloudstack.framework.config.DiagnosticsConfigDepot;
+import org.apache.cloudstack.framework.config.DiagnosticsConfigurator;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.log4j.Logger;
 
 import javax.inject.Inject;
 import java.util.HashMap;
 import java.util.List;
 
-public class DiagnosticsConfigDepotImpl implements DiagnosticsConfigDepot {
+public class DiagnosticsConfiguratorImpl implements DiagnosticsConfigurator {
 
-    private final static Logger LOGGER = Logger.getLogger(DiagnosticsConfigDepotImpl.class);
+    private final static Logger LOGGER = Logger.getLogger(DiagnosticsConfiguratorImpl.class);
     @Inject
     RetrieveDiagnosticsDao _diagnosticsDao;
 
 
     HashMap<String, List<DiagnosticsKey>> diagnosticsKeyHashMap = null;
 
-    public DiagnosticsConfigDepotImpl() {
+    public DiagnosticsConfiguratorImpl() {
     }
 
     @Override

diff --git a/...work/config/src/main/java/org/apache/cloudstack/framework/config/impl/DiagnosticsKey.java b/...work/config/src/main/java/org/apache/cloudstack/framework/config/impl/DiagnosticsKey.java
@@ -77,7 +77,7 @@ public String toString()
         return diagnosticsClassType;
     }
 
-    static DiagnosticsConfigDepotImpl s_depot = new DiagnosticsConfigDepotImpl();
+    static DiagnosticsConfiguratorImpl s_depot = new DiagnosticsConfiguratorImpl();
 
 
    public DiagnosticsKey() {

diff --git a/.../src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml b/.../src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml
@@ -49,7 +49,7 @@
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry" />
 
     <bean id="diagnosticsConfigDepotImpl"
-          class="org.apache.cloudstack.framework.config.impl.DiagnosticsConfigDepotImpl" />
+          class="org.apache.cloudstack.framework.config.impl.DiagnosticsConfiguratorImpl" />
 
     <bean id="RetrieveDiagnosticsDao"
           class="org.apache.cloudstack.framework.config.RetrieveDiagnosticsDaoImpl" />

diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/RetrieveDiagnosticsServiceImpl.java b/server/src/main/java/org/apache/cloudstack/diagnostics/RetrieveDiagnosticsServiceImpl.java
@@ -64,7 +64,7 @@
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.config.DiagnosticsConfigDepot;
+import org.apache.cloudstack.framework.config.DiagnosticsConfigurator;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
 import org.apache.cloudstack.framework.config.impl.DiagnosticsKey;
@@ -75,10 +75,12 @@
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.zip.ZipOutputStream;
 
 public class RetrieveDiagnosticsServiceImpl extends ManagerBase implements RetrieveDiagnosticsService, Configurable {
 
@@ -123,7 +125,7 @@ public class RetrieveDiagnosticsServiceImpl extends ManagerBase implements Retri
     ConfigDepot _configDepot;
 
     @Inject
-    DiagnosticsConfigDepot _diagnosticsDepot;
+    DiagnosticsConfigurator _diagnosticsDepot;
 
     @Inject
     ConfigDepot configDepot;
@@ -415,6 +417,7 @@ protected void retrieveDiagnosticsFiles(Long ssHostId, List<String> diagnosticsF
                 }
             }
         }
+        //get the downloaded files from the /tmp directory and create a zip file to add the files
         if (assignSecStorageFromRunningPool(ssHostId) != null) {
 
 
@@ -423,6 +426,13 @@ protected void retrieveDiagnosticsFiles(Long ssHostId, List<String> diagnosticsF
 
     }
 
+    private void checkDiagnosticsFilesAndZip(String diagnosticsFileName, ZipOutputStream zipFile) {
+        File f = new File(diagnosticsFileName);
+        if (f.exists() && !f.isDirectory()) {
+
+        }
+    }
+
     private List<Short> getCapacityTypesAtClusterLevel() {
         List<Short> clusterCapacityTypes = new ArrayList<Short>();
         clusterCapacityTypes.add(Capacity.CAPACITY_TYPE_CPU);

diff --git a/systemvm/debian/opt/cloud/bin/copy_zip_diagnostics.py b/systemvm/debian/opt/cloud/bin/copy_zip_diagnostics.py
@@ -0,0 +1,58 @@
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more contributor license agreements.  See the NOTICE file
+#distributed with this work for additional information
+#regarding copyright ownership.  The ASF licenses this file
+#to you under the Apache License, Version 2.0 (the
+#"License"); you may not use this file except in compliance
+#with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing,
+#software distributed under the License is distributed on an
+#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#KIND, either express or implied.  See the License for the
+#specific language governing permissions and limitations
+#under the License.
+
+# importing required modules
+
+from zipfile import ZipFile
+import os
+
+def get_all_file_paths(directory):
+
+    # initializing empty file paths list
+    file_paths = []
+    # crawling through directory and subdirectories
+    for root, directories, files in os.walk(directory):
+        for filename in files:
+            # join the two strings in order to form the full filepath.
+            filepath = os.path.join(root, filename)
+            file_paths.append(filepath)
+
+    # returning all filepaths
+    return file_paths
+
+def main():
+    # path to folder which needs to be zipped
+    directory = './python_files'
+
+    # calling function to get all file paths in the directory
+    file_paths = get_all_file_paths(directory)
+
+    # printing the list of all files to be zipped
+    print('Following files will be zipped:')
+    for file_name in file_paths:
+        print(file_name)
+
+    # writing files to a zipfile
+    with ZipFile('my_python_files.zip', 'w') as zip:
+        # writing each file one by one
+        for file in file_paths:
+            zip.write(file)
+
+    print('All files zipped successfully!')
+
+if __name__ == "__main__":
+    main()