apache status url and change version

postfinance · Aug 14, 2020 · 13cc135 · 13cc135
1 parent 4d01ba1
commit 13cc135
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 60 deletions.
diff --git a/.github/workflows/maven-publish-central.yml.old b/.github/workflows/maven-publish-central.yml.old
diff --git a/.github/workflows/maven-publish-package.yml b/.github/workflows/maven-publish-package.yml
@@ -21,6 +21,10 @@ jobs:
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
+    - if: github.event.release
+        name: Update version in pom.xml (Release only)
+        run: mvn -B versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml
 

diff --git a/README.md b/README.md
@@ -13,13 +13,20 @@ It can be importer in your Maven project with
 
 ```
 <dependency>
-    <groupId>ch.postfinance.prometheus</groupId>
-    <artifactId>apache-exporter</artifactId>
-    <version>v1.0.0</version>
+	<groupId>com.github.postfinance.prometheus</groupId>
+	<artifactId>apache-exporter</artifactId>
+	<version>0.0.0-SNAPSHOT</version>
 </dependency>
 
 ```
 
+The Apache ModStatus URL where the metrics are read, can be configured with
+
+* A System Property: httpdModStatusUrl
+* An Environment Property: HTTPD_MOD_STATUS_URL
+
+The default value is http://localhost/server-status?auto
+
 To obtain the metrics, use the method:
 
 

diff --git a/pom.xml b/pom.xml
@@ -66,40 +66,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <gpgArguments>
-                        <arg>-pinentry-mode</arg>
-                        <arg>loopback</arg>
-                    </gpgArguments>
-                </configuration>
-            </plugin-->
         </plugins>
     </build>
 
-    <!--distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-        </repository>
-    </distributionManagement!-->
-
     <distributionManagement>
         <repository>
             <id>github</id>

diff --git a/src/main/java/ch/postfinance/prometheus/ApacheExporter.java b/src/main/java/ch/postfinance/prometheus/ApacheExporter.java
@@ -136,7 +136,7 @@ private void mapStatusToMetrics(String statusData) {
 
     String readApacheStatus() throws IOException, InterruptedException {
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create("http://localhost/server-status?auto"))
+                .uri(URI.create(getStatusUrl()))
                 .timeout(Duration.ofSeconds(5))
                 .GET()
                 .build();
@@ -204,4 +204,18 @@ static String mapToState(int scoreValue) {
         return "unknown";
     }
 
+    static String getStatusUrl(){
+
+        String statusUrl = System.getProperty("httpdModStatusUrl");
+
+        if(statusUrl == null || statusUrl.trim().isEmpty()) {
+            statusUrl = System.getenv("HTTPD_MOD_STATUS_URL");
+
+            if(statusUrl == null || statusUrl.trim().isEmpty())
+                statusUrl = "http://localhost/server-status?auto";
+        }
+
+        return statusUrl;
+    }
+
 }
diff --git a/src/test/java/ch/postfinance/prometheus/ApacheExporterTest.java b/src/test/java/ch/postfinance/prometheus/ApacheExporterTest.java
@@ -12,12 +12,24 @@ public class ApacheExporterTest {
     public void export() {
         ApacheExporter exporter = new ApacheExporter();
         try {
-            for (int i = 0; i < 2; i++) {
+            for (int i = 0; i < 5; i++) {
                 System.out.println(exporter.export());
                 Thread.sleep(1000);
             }
         } catch (IOException | InterruptedException e) {
             fail(e.getMessage());
         }
     }
+
+    @Test
+    public void testProperty(){
+
+        assertEquals(ApacheExporter.getStatusUrl(), "http://localhost/server-status?auto");
+
+        System.setProperty("httpdModStatusUrl", "http://e1-xxx-alsu001/server-status?auto");
+
+        assertEquals(ApacheExporter.getStatusUrl(), "http://e1-xxx-alsu001/server-status?auto");
+
+
+    }
 }