Adding Prometheus Support #534

diemol · 2018-04-24T06:15:28Z

Comes from #533

Add initial Prometheus Support

diemol · 2018-04-24T11:09:04Z

@pearj there were some CI errors, I'll double check locally and see if their are real.

pearj · 2018-04-24T22:28:37Z

If this is creating problems with travis, maybe merge #527 onto a protected branch as well, and see how that one goes. There is more value with that change anyway.

Fixes nginx redirect issue with #533

Switch redirect to use lua plugin so that it's relative

codecov-io · 2018-04-25T12:58:14Z

Codecov Report

Merging #534 into master will decrease coverage by 1.12%.
The diff coverage is 22%.

@@             Coverage Diff              @@
##             master     #534      +/-   ##
============================================
- Coverage     80.95%   79.83%   -1.13%     
+ Complexity      585      582       -3     
============================================
  Files            32       33       +1     
  Lines          2688     2742      +54     
  Branches        233      234       +1     
============================================
+ Hits           2176     2189      +13     
- Misses          372      409      +37     
- Partials        140      144       +4

pearj · 2018-04-25T14:11:32Z

Wierd that it fails browserstack. It works on my pc™️ on browserstack.

pearj · 2018-04-25T14:17:35Z

all the logging is broken when running the tests since the move to logback I think:

13:13:32,246 |-INFO in ch.qos.logback.classic.LoggerContext[default] - Could NOT find resource [logback.groovy]
13:13:32,246 |-INFO in ch.qos.logback.classic.LoggerContext[default] - Found resource [logback.xml] at [jar:file:/home/travis/build/zalando/zalenium/target/zalenium-3.11.0e-SNAPSHOT.jar!/logback.xml]
13:13:32,269 |-INFO in ch.qos.logback.core.joran.spi.ConfigurationWatchList@7dc0f706 - URL [jar:file:/home/travis/build/zalando/zalenium/target/zalenium-3.11.0e-SNAPSHOT.jar!/logback.xml] is not of type file
13:13:32,409 |-INFO in ch.qos.logback.classic.joran.action.ConfigurationAction - debug attribute not set
13:13:32,415 |-INFO in ch.qos.logback.classic.joran.action.LoggerContextListenerAction - Adding LoggerContextListener of type [ch.qos.logback.classic.jul.LevelChangePropagator] to the object stack
13:13:32,416 |-INFO in ch.qos.logback.classic.jul.LevelChangePropagator@4009e306 - Propagating DEBUG level on Logger[ROOT] onto the JUL framework
13:13:32,421 |-INFO in ch.qos.logback.classic.joran.action.LoggerContextListenerAction - Starting LoggerContextListener

Running locally I had to do:

-Dlogback.appender=STDOUT
-Dlogback.configurationFile=logback.xml

So I guess that needs to be added into maven somehow when the tests run.
I added those jvm settings when running using the testng plugin inside eclipse

Add logback logging into integration tests

pearj · 2018-04-25T14:44:14Z

@diemol looks like I shouldn’t have added the extra clean options. It broke it.

diemol · 2018-04-25T14:48:42Z

I'll check it

Remove clean, as it breaks the tests

…nt other ones.

diemol · 2018-04-25T16:56:38Z

Somehow the BrowserStack test are failing,
https://travis-ci.org/zalando/zalenium/jobs/371137450#L6358

I also reproduced it locally. I am not sure what the reason is, I guess when the response comes back from BrowserStack something in nginx doesn't get processed properly.
Strange thing is that SauceLabs works fine.

Just by running this test loadGooglePageAndCheckTitle, I am able to reproduce.

diemol · 2018-04-25T21:19:47Z

docker/nginx.conf

@@ -26,27 +26,27 @@ http {

        location / {
            proxy_pass http://127.0.0.1:4445;
+            proxy_set_header Host      $host;
+            proxy_set_header X-Real-IP $remote_addr;


If I remove lines 29 and 30, BrowserStack works again.
The dashboard redirect also works.

Is there a reason to include them?

No, I deleted other parts of nginx config that had included them originally. I presumed it would be safe. But I guess it isn’t! I wonder why the tests didn’t fail for me locally.

OK, I'll remove them and push again.

diemol · 2018-04-25T21:36:13Z

Also, the little icons for cloud providers are not being rendered anymore. The console tries to find them at http://localhost:4444/grid/admin/ZaleniumResourceServlet/images/browserstack.png

diemol · 2018-04-25T21:44:50Z

Nevermind, just found how to fix it and it works again.

pearj · 2018-04-25T22:22:25Z

Ahh whoops. I couldn’t find the usage of the resource servlet. My bad.

pearj · 2018-04-25T22:30:09Z

src/main/java/de/zalando/ep/zalenium/aspect/HubAspect.aj

@@ -81,7 +81,7 @@ privileged public aspect HubAspect {
        handler.addServlet(LivePreviewServlet.class, "/grid/admin/live");
        handler.addServlet(ZaleniumConsoleServlet.class, "/grid/console");
        // We want resources to be at least 3 levels deep so that the prometheus servlet filter doesn't pick up all the individual resources
-        handler.addServlet(ZaleniumResourceServlet.class, "/grid/console/resources");
+        handler.addServlet(ZaleniumResourceServlet.class, "/grid/resources");


I think we should move the resources out of /grid so that it doesn’t appear in /metrics at all.

pearj · 2018-04-25T22:48:08Z

src/main/java/de/zalando/ep/zalenium/servlet/renderer/CloudProxyHtmlRenderer.java

@@ -87,13 +87,13 @@ private String getSingleSlotHtml(TestSlot s) {
        TestSession session = s.getSession();
        String icon = "";
        if (proxy instanceof TestingBotRemoteProxy) {
-            icon = "/grid/admin/ZaleniumResourceServlet/images/testingbot.png";
+            icon = "/grid/resources/images/testingbot.png";


Maybe just straight /resources pretty sure the hub doesn’t use it

Maybe let’s just merge and when we add zalenium Prometheus metrics. I’ll move the resources somewhere else now that I know what uses them.

pearj · 2018-04-25T22:51:51Z

👍

* Update cloud icon locations

pearj · 2018-04-26T00:30:17Z

src/test/java/de/zalando/ep/zalenium/it/ParallelIT.java

@@ -115,7 +115,7 @@ private WebDriver getWebDriver() {
    public void checkIframeLinksForLivePreview(String browserType, Platform platform) {

        // Go to the homepage
-        getWebDriver().get(String.format("http://%s:%s/grid/admin/live", ZALENIUM_HOST, ZALENIUM_PORT));
+        getWebDriver().get(String.format("http://%s:%s/grid/admin/live", hostIpAddress, ZALENIUM_PORT));


It could work in kubernetes in theory, if you run the test as a sidecar container (but it'd be fiddly), but just curious why we can't rely on ZALENIUM_HOST having the hostIpAddress? That way it can work for both docker and kubernetes.

What do we get out of finding the grid by using the current IP address inside the test? All it seems to do is ensure that maven is running on the same IP address as zalenium?

The purpose of it was to check that the live view was reachable also by its ip and that the headers were being forwarded properly, since we broke that once.

When the live view is done again, we can just do it from scratch.

parberge

the /metrics endpoint looks good.
Also, the change to nginx makes /dashboard and /dashboard/ work regardless of port used

parberge · 2018-04-26T06:31:24Z

👍

Move zalenium resources to /resources and make wildcard

diemol · 2018-04-26T08:27:28Z

👍

parberge · 2018-04-26T11:52:00Z

👍

diemol · 2018-04-26T15:28:46Z

Thanks @pearj!

pearj and others added 5 commits April 20, 2018 08:44

Adding vanilla prometheus /metrics endpoint

3c04479

Move zalenium servlets registration into aspect

9a28e72

Fix error when dashboard tries to delete files that don't exist

d86ecf6

Fix redirects in nginx

fd0b3eb

Merge pull request #533 from pearj/prometheus

732d6ed

Add initial Prometheus Support

diemol changed the title ~~Merge #533~~ Adding Prometheus Support Apr 25, 2018

pearj and others added 2 commits April 25, 2018 22:53

Switch redirect to use lua plugin so that it's relative

27f457f

Fixes nginx redirect issue with #533

Merge pull request #538 from pearj/merge-533

1beb22b

Switch redirect to use lua plugin so that it's relative

pearj and others added 3 commits April 26, 2018 00:24

Add logback logging into integration tests

6c7b1d7

Don't use local ip, as it doesn't work with kubernetes

46f8856

Merge pull request #539 from pearj/merge-533

941ea6a

Add logback logging into integration tests

Remove clean, as it breaks the tests

e01ac0c

diemol and others added 4 commits April 25, 2018 16:50

Merge pull request #540 from pearj/merge-533

9d0453a

Remove clean, as it breaks the tests

Reverting test change, intended for docker, for k8s we should impleme…

1f0d400

…nt other ones.

Adding logback-test for tests

dd88f1f

Reverting change for docker tests

cd32e28

Fixing NPE when test does not go to cloud service.

a5637be

diemol commented Apr 25, 2018

View reviewed changes

Changing route to load the cloud providers' icons.

199265d

pearj reviewed Apr 25, 2018

View reviewed changes

Removing nginx options brings BrowserStack back.

d67054d

pearj reviewed Apr 25, 2018

View reviewed changes

Move zalenium resources to /resources and make wildcard

549ed6a

* Update cloud icon locations

pearj mentioned this pull request Apr 26, 2018

Move zalenium resources to /resources and make wildcard #542

Merged

pearj reviewed Apr 26, 2018

View reviewed changes

parberge approved these changes Apr 26, 2018

View reviewed changes

Merge pull request #542 from pearj/merge-533

140c1c0

Move zalenium resources to /resources and make wildcard

diemol merged commit c4cea48 into master Apr 26, 2018

diemol deleted the merge-533 branch April 26, 2018 15:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding Prometheus Support #534

Adding Prometheus Support #534

diemol commented Apr 24, 2018 •

edited

Loading

diemol commented Apr 24, 2018

pearj commented Apr 24, 2018

codecov-io commented Apr 25, 2018 •

edited

Loading

pearj commented Apr 25, 2018

pearj commented Apr 25, 2018 •

edited

Loading

pearj commented Apr 25, 2018

diemol commented Apr 25, 2018

diemol commented Apr 25, 2018 •

edited

Loading

diemol Apr 25, 2018

pearj Apr 25, 2018

diemol Apr 25, 2018

diemol commented Apr 25, 2018

diemol commented Apr 25, 2018

pearj commented Apr 25, 2018

pearj Apr 25, 2018

pearj Apr 25, 2018

pearj Apr 25, 2018

pearj commented Apr 25, 2018

pearj Apr 26, 2018

diemol Apr 26, 2018

parberge left a comment •

edited

Loading

parberge commented Apr 26, 2018

diemol commented Apr 26, 2018

parberge commented Apr 26, 2018

diemol commented Apr 26, 2018

Adding Prometheus Support #534

Adding Prometheus Support #534

Conversation

diemol commented Apr 24, 2018 • edited Loading

diemol commented Apr 24, 2018

pearj commented Apr 24, 2018

codecov-io commented Apr 25, 2018 • edited Loading

Codecov Report

pearj commented Apr 25, 2018

pearj commented Apr 25, 2018 • edited Loading

pearj commented Apr 25, 2018

diemol commented Apr 25, 2018

diemol commented Apr 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

diemol commented Apr 25, 2018

diemol commented Apr 25, 2018

pearj commented Apr 25, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pearj commented Apr 25, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

parberge left a comment • edited Loading

Choose a reason for hiding this comment

parberge commented Apr 26, 2018

diemol commented Apr 26, 2018

parberge commented Apr 26, 2018

diemol commented Apr 26, 2018

diemol commented Apr 24, 2018 •

edited

Loading

codecov-io commented Apr 25, 2018 •

edited

Loading

pearj commented Apr 25, 2018 •

edited

Loading

diemol commented Apr 25, 2018 •

edited

Loading

parberge left a comment •

edited

Loading