Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MiddlewareServerEap and MiddlewareServerWildfly for Utilization charts #2976

Merged
merged 1 commit into from
Dec 8, 2017

Conversation

aljesusg
Copy link
Member

@aljesusg aljesusg commented Dec 7, 2017

Bugzilla #1510548

MiddlewareServerEap and MiddlewareServerWildfly was not in the list of types.

charts_utilization

cc @abonas

@aljesusg
Copy link
Member Author

aljesusg commented Dec 7, 2017

Review @ManageIQ/committers-hawkular

@abonas
Copy link
Member

abonas commented Dec 7, 2017

@miq-bot add_label gaprindashvili/yes

@abonas
Copy link
Member

abonas commented Dec 7, 2017

@miq-bot add_label bug, middleware

@abonas
Copy link
Member

abonas commented Dec 7, 2017

@cfcosta please review

@abonas
Copy link
Member

abonas commented Dec 7, 2017

@tumido please review

@abonas
Copy link
Member

abonas commented Dec 7, 2017

commit message has a typo (Utilziation) , please fix

@@ -634,7 +634,7 @@ def perf_gen_data_before_wait
from_dt,
to_dt,
interval_type]
elsif %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging).include?(@perf_record.class.name.demodulize)
elsif %w(MiddlewareServer MiddlewareServerEap MiddlewareDatasource MiddlewareMessaging).include?(@perf_record.class.name.demodulize)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about MiddlewareServerWildfly? it sounds like it would have the same problem, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes We'll have the same problem. Added MiddlewareServerWildfly.

@aljesusg aljesusg force-pushed the fix_utilization_EAP_server branch 2 times, most recently from ac79425 to c8c924d Compare December 7, 2017 12:13
@aljesusg
Copy link
Member Author

aljesusg commented Dec 7, 2017

Edited commit message and added MiddlewareServerWildfly

@aljesusg aljesusg changed the title Add MiddlewareServerEap for Utilization charts Add MiddlewareServerEap and MiddlewareServerWildfly for Utilization charts Dec 7, 2017
Copy link
Member

@tumido tumido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also it seems you've forgot to do the change for realtime branch on line 664

@@ -634,7 +634,7 @@ def perf_gen_data_before_wait
from_dt,
to_dt,
interval_type]
elsif %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging).include?(@perf_record.class.name.demodulize)
elsif %w(MiddlewareServer MiddlewareServerEap MiddlewareServerWildfly MiddlewareDatasource MiddlewareMessaging).include?(@perf_record.class.name.demodulize)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to add every class every time we decide something should be sub-classed. I would prefer this much more: %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging).any? { |e| @perf_record.kind_of? e.constantize }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that this objct is MiddlewareServerEAP so ..or we control that object include MiddlewareServer or we must check the type.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I forgot the real-time I'll do after this discussion about how we are going to do it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well it works for me. MiddlewareServerEap is still a kind_of? MiddlewareServer so we can check the type properly:

image

The code I've posted works 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see that your proposal was kind_of ^^ ok I agree with you, I am gonna make the change Thanks @tumido

@aljesusg aljesusg force-pushed the fix_utilization_EAP_server branch from c8c924d to feb3f65 Compare December 7, 2017 18:23
@aljesusg
Copy link
Member Author

aljesusg commented Dec 7, 2017

I did the changes @tumido thanks

@aljesusg aljesusg force-pushed the fix_utilization_EAP_server branch from feb3f65 to f7e71ea Compare December 7, 2017 18:30
…ap and MiddlewareServerWildfly for Utilization charts
@aljesusg aljesusg force-pushed the fix_utilization_EAP_server branch from f7e71ea to 0ec98f3 Compare December 7, 2017 18:36
@miq-bot
Copy link
Member

miq-bot commented Dec 7, 2017

Checked commit aljesusg@0ec98f3 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 👍

Copy link
Member

@tumido tumido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks much better! 🎉

I know the test coverage is poor in this area (and refactoring is needed), so I leave that on others to decide - can we have this tiny part covered by tests? Something like "with these entities we can at least render a chart" testcases.

@mzazrivec mzazrivec added this to the Sprint 75 Ending Dec 11, 2017 milestone Dec 8, 2017
@mzazrivec mzazrivec merged commit bec1a6f into ManageIQ:master Dec 8, 2017
simaishi pushed a commit that referenced this pull request Dec 11, 2017
Add MiddlewareServerEap and MiddlewareServerWildfly for Utilization charts
(cherry picked from commit bec1a6f)

https://bugzilla.redhat.com/show_bug.cgi?id=1524706
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit fac9550281470254a51e184286a5e4951e4fec19
Author: Milan Zázrivec <[email protected]>
Date:   Fri Dec 8 11:04:44 2017 +0100

    Merge pull request #2976 from aljesusg/fix_utilization_EAP_server
    
    Add MiddlewareServerEap and MiddlewareServerWildfly for Utilization charts
    (cherry picked from commit bec1a6fa3d8104a10fc663b119355f90ae6a659c)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1524706

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants