nellemann
/
sysmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Cleanup and fix username in drone pipeline.
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Mark Nellemann 2023-01-04 15:00:31 +01:00
parent f9192bd223
commit 5faeb36000
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.yml
View File

@ -15,12 +15,12 @@ steps:
from_secret: auth # Name of DroneCI secret exposed above from_secret: auth # Name of DroneCI secret exposed above
commands: commands:
- ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository - ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository
- for file in server/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in server/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
- for file in server/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in server/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
- for file in client/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in client/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
- for file in client/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in client/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
- for file in plugins/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in plugins/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
- for file in plugins/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in plugins/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
when: when:
event: event:
- tag - tag

7
client/src/main/java/sysmon/client/ScriptWrapper.java
View File

@ -9,6 +9,7 @@ import sysmon.shared.MetricScript;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
public class ScriptWrapper { public class ScriptWrapper {
@ -20,9 +21,9 @@ public class ScriptWrapper {
public ScriptWrapper(String scriptPath, String scriptFile) { public ScriptWrapper(String scriptPath, String scriptFile) {
try { try {
Class scriptClass = loader.parseClass(new File(scriptPath, scriptFile)); Class<?> scriptClass = loader.parseClass(new File(scriptPath, scriptFile));
script = (GroovyObject) scriptClass.newInstance(); script = (GroovyObject) scriptClass.getDeclaredConstructor().newInstance();
} catch (IOException |InstantiationException | IllegalAccessException e) { } catch (IOException |InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
log.error("ScriptWrapper() - error: {}", e.getMessage()); log.error("ScriptWrapper() - error: {}", e.getMessage());
} }
} }

1
plugins/base/src/main/java/sysmon/plugins/base/BaseFilesystemExtension.java
View File

@ -33,7 +33,6 @@ public class BaseFilesystemExtension implements MetricExtension {
add("/boot/efi"); add("/boot/efi");
}}; }};
private HardwareAbstractionLayer hardwareAbstractionLayer;
private SystemInfo systemInfo; private SystemInfo systemInfo;
private List<OSFileStore> fileStores; private List<OSFileStore> fileStores;
private int refreshCounter = 0; private int refreshCounter = 0;

1
server/src/main/java/sysmon/server/ComboResultToPointProcessor.java
View File

@ -8,7 +8,6 @@ import sysmon.shared.ComboResult;
import sysmon.shared.Measurement; import sysmon.shared.Measurement;
import sysmon.shared.MetricResult; import sysmon.shared.MetricResult;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class ComboResultToPointProcessor implements Processor { public class ComboResultToPointProcessor implements Processor {

1
server/src/main/java/sysmon/server/MetricResultToPointProcessor.java
View File

@ -8,7 +8,6 @@ import sysmon.shared.Measurement;
import sysmon.shared.MetricResult; import sysmon.shared.MetricResult;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class MetricResultToPointProcessor implements Processor { public class MetricResultToPointProcessor implements Processor {

1
shared/src/main/java/sysmon/shared/Measurement.java
View File

@ -1,7 +1,6 @@
package sysmon.shared; package sysmon.shared;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.TreeMap; import java.util.TreeMap;