From 9e24e2933aa5820903d5b7e8bd61617df8c7d911 Mon Sep 17 00:00:00 2001
From: Mans Ziesel <mans@mziesel.com>
Date: Sun, 8 Sep 2024 13:38:52 +0200
Subject: [PATCH] add changes before cleanup

---
 .idea/gradle.xml                            |  1 +
 .idea/workspace.xml                         | 78 +++++++++++----------
 src/main/resources/JmonitConfig.pkl         |  8 +++
 src/main/resources/JmonitConfigTemplate.pkl |  9 +++
 4 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 14746e7..2a65317 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b3d066..f3c9cc2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="99a808b4-b8c5-4c6a-8a7b-960f11e07db3" name="Changes" comment="Make application use monitors in config, try handle gracefull shutdown">
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/nl/mziesel/BaseMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/nl/mziesel/BaseMonitor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/nl/mziesel/HttpMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/nl/mziesel/HttpMonitor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/nl/mziesel/IcmpMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/nl/mziesel/IcmpMonitor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/nl/mziesel/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/nl/mziesel/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/JmonitConfig.pkl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/JmonitConfig.pkl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/JmonitConfigTemplate.pkl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/JmonitConfigTemplate.pkl" afterDir="false" />
     </list>
@@ -97,43 +93,46 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProblemsViewState">
     <option name="selectedTabId" value="ProjectErrors" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 6
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
   <component name="ProjectId" id="2buOVAM2wRC1qrdIQSuvfsVXCGU" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Gradle.jmonit [:JmonitConfig.main()].executor": "Run",
-    "Gradle.jmonit [:Main.main()].executor": "Run",
-    "Gradle.jmonit [assembleDist].executor": "Run",
-    "Gradle.jmonit [build].executor": "Run",
-    "Gradle.jmonit [clean].executor": "Run",
-    "Gradle.jmonit [configClasses].executor": "Run",
-    "Gradle.jmonit [jar].executor": "Run",
-    "Gradle.jmonit [testPklConfig].executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "git-widget-placeholder": "gradle",
-    "kotlin-language-version-configured": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "org.pkl.intellij.settings.PklSettingsConfigurable",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Gradle.jmonit [:JmonitConfig.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [:Main.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [assembleDist].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [build].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [configClasses].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [jar].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.jmonit [testPklConfig].executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;settings.sync&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
-  <component name="RunManager" selected="Gradle.jmonit [testPklConfig]">
+}</component>
+  <component name="RunManager" selected="Gradle.jmonit [build]">
     <configuration name="jmonit [assembleDist]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -178,7 +177,7 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
-    <configuration name="jmonit [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="jmonit [configClasses]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -189,7 +188,7 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value="clean" />
+            <option value="configClasses" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -246,18 +245,19 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.jmonit [build]" />
+        <item itemvalue="Gradle.jmonit [configClasses]" />
         <item itemvalue="Gradle.jmonit [testPklConfig]" />
         <item itemvalue="Gradle.jmonit [assembleDist]" />
         <item itemvalue="Gradle.jmonit [jar]" />
-        <item itemvalue="Gradle.jmonit [build]" />
-        <item itemvalue="Gradle.jmonit [clean]" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="jdk-21.0.2-openjdk-21.0.2-4caba194b151-78a6f59c" />
+        <option value="bundled-jdk-9f38398b9061-18abd8497189-intellij.indexing.shared.core-IU-241.14494.240" />
+        <option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-IU-241.14494.240" />
       </set>
     </attachedChunks>
   </component>
@@ -270,6 +270,10 @@
       <option name="presentableId" value="Default" />
       <updated>1707061517834</updated>
       <workItem from="1707061518829" duration="10760000" />
+      <workItem from="1707146665294" duration="461000" />
+      <workItem from="1707160972056" duration="25000" />
+      <workItem from="1713979540341" duration="2728000" />
+      <workItem from="1714037666044" duration="18000" />
     </task>
     <task id="LOCAL-00001" summary="Add PKL lib, add test config, create initial jmonit config template">
       <option name="closed" value="true" />
diff --git a/src/main/resources/JmonitConfig.pkl b/src/main/resources/JmonitConfig.pkl
index 17a34ec..1947faf 100644
--- a/src/main/resources/JmonitConfig.pkl
+++ b/src/main/resources/JmonitConfig.pkl
@@ -1,5 +1,13 @@
 amends "./JmonitConfigTemplate.pkl"
 
+databaseConfig {
+  username = "root"
+  password = "password"
+  host = "localhost"
+  port = 3306
+  database = "joomla"
+}
+
 monitors {
   new {
     monitorType = "https"
diff --git a/src/main/resources/JmonitConfigTemplate.pkl b/src/main/resources/JmonitConfigTemplate.pkl
index 93be0cd..d89a744 100644
--- a/src/main/resources/JmonitConfigTemplate.pkl
+++ b/src/main/resources/JmonitConfigTemplate.pkl
@@ -6,6 +6,14 @@ typealias MonitorType = "http"|"https"|"icmp"
 const defaultTimeout: Int = 5000
 const defaultInterval: Int = 120
 
+class Database {
+  username: String(!isEmpty)
+  password: String
+  host: String(!isEmpty)
+  port: Int
+  database: String(!isEmpty)
+}
+
 class Monitor {
   monitorType: MonitorType
   friendlyName: String(!isEmpty)
@@ -14,4 +22,5 @@ class Monitor {
   interval: Int = defaultInterval
 }
 
+databaseConfig: Database
 monitors: Listing<Monitor>
\ No newline at end of file