Skip to content

centos6 changes#354

Merged
gmmeyer merged 4 commits intomasterfrom
greg/centos6
Jul 3, 2017
Merged

centos6 changes#354
gmmeyer merged 4 commits intomasterfrom
greg/centos6

Conversation

@gmmeyer
Copy link
Copy Markdown
Contributor

@gmmeyer gmmeyer commented Jun 28, 2017

What does this PR do?

This is what we needed to change to get this working on centos6. We needed to enable the alternative python (see the related container PR). And we needed to add an upstart file.

Motivation

It had to be done.

Additional Notes

Kenafah needs to sign off on all these changes as well, as mentioned in the container PR this will affect them as well.

@@ -113,6 +113,7 @@
end

if redhat?
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can you remove this conditional (and the debian? one below), since we're doing the exact same thing on both platforms

@gmmeyer gmmeyer changed the title adds upstart file for centos6 centos6 changes Jun 29, 2017
Copy link
Copy Markdown
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

Let's merge as soon as the CI pipeline is green

@gmmeyer gmmeyer merged commit 2a22841 into master Jul 3, 2017
@gmmeyer gmmeyer deleted the greg/centos6 branch July 3, 2017 22:21
derekwbrown pushed a commit that referenced this pull request Jul 11, 2017
* adds upstart file to centos6

* adds upstart file to rpm

* changes conditional

* enables alternative python
derekwbrown added a commit that referenced this pull request Jul 12, 2017
* [load] adding system check.

* [system][iostats] adding iostats check + tests.

* [iostats] more precise comment..

* [uptime] adding check + tests.

* [load] removing logging statement.

* [iostats][test] amending expected number of asserted calls.

* [iostats] improve windows support.

* [iostats] refactor unix specific io submission, for clarity.

* [iostats] refactor, windows numbers differ greatly. Currently not BW compatible.

* [iostats] removing unnecessary C(go) header.

* [iostats] implement device blacklist.

* [iostats] fixing blacklist management + adding test.

* [windows] implement windows IO check

* Initial checkin of code using both WMI & PDH

* Modified APM request

* touch up logging.  Remove calls to APM

* [load] adding system check.

* [system][iostats] adding iostats check + tests.

* [iostats] more precise comment..

* [load] removing logging statement.

* [iostats] improve windows support.

* [iostats] refactor unix specific io submission, for clarity.

* [iostats] refactor, windows numbers differ greatly. Currently not BW compatible.

* [iostats] removing unnecessary C(go) header.

* [iostats] implement device blacklist.

* [iostats] fixing blacklist management + adding test.

* [windows] implement windows IO check

* Initial checkin of code using both WMI & PDH

* Modified APM request

* touch up logging.  Remove calls to APM

* Switch back to wmi, at least for now.  Neither PDH nor WMI is picking up disk changes, at least in the manner tested.

* Fix problems with merge

* Fix merge.   Currently uses WMI; will re-add pdh based IO check at a later
date

* Changes to reflect review feedback

* centos6 changes (#354)

* adds upstart file to centos6

* adds upstart file to rpm

* changes conditional

* enables alternative python

* Fix gitlab ci so ci testing can continue

* Final review feedback.  Make string conversion more efficient by using a
byte buffer to do the original conversion, rather than appending a
character on to the string for each pass.

* Final review feedback. Make string conversion more efficient by using a
byte buffer to do the original conversion, rather than appending a
character on to the string for each pass.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants