add monitorring to CI Server setup (#772) (#799)

* add monitorring to CI Server setup (#772)
* fix: failing windows test

Author: BeckerFrank

mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/bugzilla/rest/core/tests/BugzillaRestClientTest.java

@@ -312,22 +312,22 @@ public String getProduct() {
 		assertTrue(taskDataHandler.initializeTaskData(repository, taskData, null, null));
 		assertEquals(
 				IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/taskData.txt"),
-						Charset.defaultCharset()),
-				taskData.getRoot().toString());
+						Charset.defaultCharset()).replace("\r\n", "\n"),
+				taskData.getRoot().toString().replace("\r\n", "\n"));
 		taskData = new TaskData(mapper, repository.getConnectorKind(), repository.getRepositoryUrl(), "");
 		assertTrue(taskDataHandler.initializeTaskData(repository, taskData, taskMappingInit, null));
 		assertEquals(
 				IOUtils.toString(
 						CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/taskData1.txt"),
-						Charset.defaultCharset()),
-				taskData.getRoot().toString());
+						Charset.defaultCharset()).replace("\r\n", "\n"),
+				taskData.getRoot().toString().replace("\r\n", "\n"));
 		taskData = new TaskData(mapper, repository.getConnectorKind(), repository.getRepositoryUrl(), "");
 		assertTrue(taskDataHandler.initializeTaskData(repository, taskData, taskMappingSelect, null));
 		assertEquals(
 				IOUtils.toString(
 						CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/taskData2.txt"),
-						Charset.defaultCharset()),
-				taskData.getRoot().toString());
+						Charset.defaultCharset()).replace("\r\n", "\n"),
+				taskData.getRoot().toString().replace("\r\n", "\n"));
 	}
 
 	@Test
@@ -599,12 +599,13 @@ public String getVersion() {
 		taskDataGet.getRoot().removeAttribute("task.common.operation-duplicate");
 		taskDataGet.getRoot().removeAttribute(BugzillaRestTaskSchema.getDefault().DUPE_OF.getKey());
 
-		assertEquals(taskData.getRoot().toString(), taskDataGet.getRoot().toString());
+		assertEquals(taskData.getRoot().toString().replace("\r\n", "\n"),
+				taskDataGet.getRoot().toString().replace("\r\n", "\n"));
 		assertEquals(
 				IOUtils.toString(
 						CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/taskDataFlags.txt"),
-						Charset.defaultCharset()),
-				flags.toString());
+						Charset.defaultCharset()).replace("\r\n", "\n"),
+				flags.toString().replace("\r\n", "\n"));
 	}
 
 	@Test

org.eclipse.mylyn.releng/multipass/mylyn_setup.yml

@@ -99,6 +99,23 @@
     - role: mylyn_idx
       vars:
         common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
+
+    - role: node-exporter
+      tags:
+        - node-exporter
+      vars:
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
+    - role: prometheus
+      tags:
+        - prometheus
+      vars:
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
+    - role: grafana
+      tags:
+        - grafana
+      vars:
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
+
     - role: artifactory
       tags:
         - artifactory
@@ -109,7 +126,7 @@
         - gitlab
       vars:
         common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
-        gitlabImageVersion: "17.7.0"
+        gitlabImageVersion: "18.1.2-ce.0"
         gitlabHostURL: "gitlab.{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: jenkins
       tags:
@@ -131,3 +148,8 @@
           - { git_branch: "release-5.2-stable", servmame: "bugzilla-5_2", port1: 8094, port2: 8494, image_tag: "5.2", extra_info: '' }
           - { git_branch: "release-5.2-stable", servmame: "bugzilla-5_2-rest", port1: 8095, port2: 8495, image_tag: "5.2-rest", extra_info: '"rest_enabled":"true", "default": "true", "testdataVersion": "Version1"' }
           - { git_branch: "release-5.2-stable", servmame: "bugzilla-5_2-rest-api", port1: 8096, port2: 8496, image_tag: "5.2-rest-api", extra_info: '"rest_enabled": "true", "api_key_enabled": "true", "testdataVersion": "Version1"' }
+#    - role: cadvisor
+#      tags:
+#        - cadvisor
+#      vars:
+#        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"

org.eclipse.mylyn.releng/multipass/roles/grafana/files/files/Dockerfile

@@ -0,0 +1,4 @@
+FROM grafana/grafana:12.2.0-16636675413-ubuntu
+
+ADD ./dashboards/ /etc/grafana/provisioning/dashboards/
+ADD ./datasources/ /etc/grafana/provisioning/datasources/

org.eclipse.mylyn.releng/multipass/roles/grafana/files/files/custom.ini

@@ -0,0 +1,4 @@
+[security]
+
+admin_user = mylynadmin
+admin_password = mylyntest