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.

Sign up for GitHub

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

Jump to bottom

Host-Metering honors RHSM proxy configurations #61

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Host-Metering honors RHSM proxy configurations #61

merged 3 commits into from
Sep 2, 2024

Conversation

F-X64
Copy link
Collaborator

@F-X64 F-X64 commented Aug 28, 2024 •
edited
Loading

Description
Add conditional loading of proxy information from /etc/rhsm/rhsm.conf.
Add log output to host info about proxy configuration.

Added log output:

        |  CpuCount: 0
        |  HostName: host.mock.test
        |  HostId: 01234567-89ab-cdef-0123-456789abcdef
        |  HTTP Proxy: No proxy set
        |  HTTPS Proxy: No proxy set
        |  ExternalOrganization: 12345678
        |  SocketCount: 3
        |  Product: [394 69]
        |  Support: Premium
        |  Usage: Production
        |  ConversionsSuccess: true
        |  Billing.Model: marketplace
        |  Billing.Marketplace: gcp
        |  Billing.MarketplaceAccount: 000000000000
        |  Billing.MarketplaceInstanceId: 1111111111111111111

Proxy config prioritization:

  1. Prefere HTTP/S_PROXY envs that are either passed to the service or loaded from drop in configuration files.
  2. If the HTTPS_PROXY information aren't available at runtime, load proxy configuration from /etc/rhsm/rhsm.conf.

@F-X64 F-X64 marked this pull request as draft August 28, 2024 08:07
@F-X64 F-X64 requested review from major and ConorC117 August 28, 2024 08:09
@F-X64 F-X64 force-pushed the read-rhsm-proxy-config branch from 061c44d to 08d4c80 Compare August 28, 2024 12:00
major
major approved these changes Aug 28, 2024
View reviewed changes
Copy link
Collaborator

@major major left a comment

Choose a reason for hiding this comment

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

LGTM

ConorC117
ConorC117 approved these changes Aug 28, 2024
View reviewed changes
Copy link
Collaborator

@ConorC117 ConorC117 left a comment

Choose a reason for hiding this comment

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

LGTM too!

F-X64 added 2 commits August 30, 2024 07:54
@F-X64
feat: load proxy config on service start
31f7fa6 
Add startup script to load proxy config from rhsm.conf
Add script to spec file
Modify ExecStart param of systemd service

Signed-off-by: fkolwa <[email protected]>
@F-X64
feat: add proxy config to hostinfo
74bcbce 
Add logging of HTTP / HTTPS_PROXY env
Add proxy output to info_test

Signed-off-by: fkolwa <[email protected]>
@F-X64 F-X64 force-pushed the read-rhsm-proxy-config branch from 08d4c80 to 9865d35 Compare August 30, 2024 05:55
@F-X64
refactor: extend manpage
79b2492 
Add information about proxy configuration parsed from rhsm.conf
Add information about drop in service configurations

Signed-off-by: fkolwa <[email protected]>
@F-X64 F-X64 force-pushed the read-rhsm-proxy-config branch from 9865d35 to 79b2492 Compare August 30, 2024 05:58
@F-X64 F-X64 requested a review from ConorC117 August 30, 2024 06:02
@F-X64
Copy link
Collaborator Author

F-X64 commented Aug 30, 2024

@ConorC117 I could use a review of my man page additions from a native speaker.
Can you give it another look?

ConorC117
ConorC117 approved these changes Aug 30, 2024
View reviewed changes
Copy link
Collaborator

@ConorC117 ConorC117 left a comment

Choose a reason for hiding this comment

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

@F-X64 Had a look and reads well to me!

@F-X64 F-X64 marked this pull request as ready for review September 2, 2024 06:02
@F-X64 F-X64 merged commit e219a8e into main Sep 2, 2024
7 of 8 checks passed
@F-X64 F-X64 deleted the read-rhsm-proxy-config branch September 2, 2024 06:02
@github-actions GitHub Actions
Copy link

🎉 This PR is included in version 1.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ConorC117 ConorC117 ConorC117 approved these changes

@major major major approved these changes

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@F-X64 @major @ConorC117