Merge pull request #68 from idealista/develop

Develop
idealista · Sep 6, 2023 · e23a0c6 · e23a0c6
2 parents f119370 + a554a49
commit e23a0c6
Show file tree

Hide file tree

Showing 14 changed files with 448 additions and 399 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
+dist: jammy
 language: python
-python: "3.9"
-sudo: required
+python: 3.9
 services:
   - docker
 install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/prometheus_jmx_exporter_role/tree/develop)
 
+## [2.3.0](https://github.com/idealista/prometheus_jmx_exporter_role/tree/2.3.0)
+### Fixed
+- *[#66](https://github.com/idealista/prometheus_jmx_exporter_role/issues/66) Unable to install versions >= 0.17.0* @sorobon
+
 ## [2.2.0](https://github.com/idealista/prometheus_jmx_exporter_role/tree/2.2.0)
 ### Added
 - *[#62](https://github.com/idealista/prometheus_jmx_exporter_role/issues/62) Allow to change jmx_exporter_url* @sorobon

diff --git a/Pipfile b/Pipfile
@@ -4,14 +4,14 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-ansible = "==5.0.1"
-molecule = "==3.5.2"
+ansible = "==5.2.0"
+molecule = "==5.0.1"
 molecule-docker = "==1.1.0"
-docker = "==4.4.4"
+docker = "==6.1.3"
 ansible-lint = "==4.2.0"
 yamllint = "==1.29.0"
 
 [dev-packages]
 
 [requires]
-python_version = "3"
+python_version = "3.9"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 ## General
 
-jmx_exporter_version: 0.3.1
+jmx_exporter_version: 0.20.0
 
 ## Service options
 
@@ -48,5 +48,5 @@ jmx_exporter_internal_port: 5555
 jmx_exporter_xmx: 32m
 jmx_exporter_xms: 32m
 
-## This should be true if you want to debug with Vagrant and Jconsole
-jmx_rmi: false
+## This should be true if you want to debug with tools like Jconsole
+jmx_exporter_rmi: "{{ jmx_rmi if jmx_rmi is defined and jmx_rmi is not sameas None and jmx_rmi else false }}"
diff --git a/molecule/custom_configuration/group_vars/jmxexporter.yml b/molecule/custom_configuration/group_vars/jmxexporter.yml
@@ -4,7 +4,7 @@ jmx_exporter_service_state: started
 
 jmx_exporter_port: 9119
 
-jmx_rmi: true
+jmx_exporter_rmi: true
 
 jmx_exporter_private_tmp: false
 

diff --git a/molecule/custom_configuration/requirements.yml b/molecule/custom_configuration/requirements.yml
@@ -1,4 +1,5 @@
 ---
-- src: idealista.java_role
-  version: 8.0.0
+- src: https://github.com/idealista/java_role.git
+  scm: git
+  version: 9.0.1
   name: java_role
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -1,6 +1,6 @@
 ---
 - name: Converge
-  hosts: all
+  hosts: jmxexporter
   roles:
-    - role: java_role
-    - role: prometheus_jmx_exporter_role
+    - java_role
+    - prometheus_jmx_exporter_role
diff --git a/molecule/default/group_vars/jmxexporter.yml b/molecule/default/group_vars/jmxexporter.yml
@@ -4,6 +4,6 @@ jmx_exporter_service_state: started
 
 jmx_exporter_port: 9119
 
-jmx_rmi: true
+jmx_exporter_rmi: true
 
 jmx_exporter_private_tmp: false
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
@@ -1,4 +1,6 @@
 ---
-- src: idealista.java_role
-  version: 8.0.0
+
+- src: https://github.com/idealista/java_role.git
+  scm: git
+  version: 9.0.1
   name: java_role
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -2,10 +2,10 @@
 - name: Verify
   hosts: all
   vars:
-    goss_version: v0.3.11
+    goss_version: v0.3.16
     goss_arch: amd64
     goss_dest: /usr/local/bin/goss
-    goss_sha256sum: 7a751c102abac61fd8dff45f87f36c3732cb5158e1414ab78e6877864fc2f7a4
+    goss_sha256sum: 827e354b48f93bce933f5efcd1f00dc82569c42a179cf2d384b040d8a80bfbfb
     goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}"
     goss_test_directory: /tmp
     goss_format: documentation

diff --git a/templates/jmx_exporter.service.j2 b/templates/jmx_exporter.service.j2
@@ -9,7 +9,7 @@ User={{ jmx_exporter_user }}
 Group={{ jmx_exporter_group }}
 RuntimeDirectory=jmx_exporter
 Environment='JAVA_OPTS=-Djava.awt.headless=true \
-{% if jmx_rmi %}
+{% if jmx_exporter_rmi %}
     -Dcom.sun.management.jmxremote.port={{ jmx_exporter_internal_port }} \
     -Dcom.sun.management.jmxremote.rmi.port={{ jmx_exporter_internal_port }} \
     -Djava.rmi.server.hostname={{ inventory_hostname }} \

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,6 +1,6 @@
-ansible==5.0.1
-molecule==3.5.2
+ansible==5.2.0
+molecule==5.0.1
 molecule-docker==1.1.0 
-docker==4.4.4
+docker==6.1.3
 ansible-lint==4.2.0
 yamllint==1.29.0
diff --git a/vars/main.yml b/vars/main.yml
@@ -1,6 +1,8 @@
 ---
 
-jmx_exporter_bin_name: "jmx_prometheus_httpserver-{{ jmx_exporter_version }}-jar-with-dependencies.jar"
+jmx_exporter_bin_name: "{{ jmx_exporter_bin_name_new if jmx_exporter_version is version('0.17.0', '>=') else jmx_exporter_bin_name_old }}"
+jmx_exporter_bin_name_old: "jmx_prometheus_httpserver-{{ jmx_exporter_version }}-jar-with-dependencies.jar"
+jmx_exporter_bin_name_new: "jmx_prometheus_httpserver-{{ jmx_exporter_version }}.jar"
 jmx_exporter_default_url: "https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/{{ jmx_exporter_version }}/{{ jmx_exporter_bin_name }}"
 
 jmx_exporter_jar_file: "jmx_exporter.jar"