update configuration.py for netbox 2.7.11 REDIS config

[ryanmerolle]

update configuration.py to use REDIS config referencing tasks in place of webhooks

Related Issue: #266

New Behavior

Minor configuration.py tweak to only change the REDIS config in configuration.py

Contrast to Current Behavior

Eliminates the message of "The 'webhooks' REDIS configuration section has been renamed to 'tasks'. Please update your configuration as "

Discussion: Benefits and Drawbacks

Could add more with regards REDIS SENTINELS config, but limited this to address the just the PR.

Changes to the Wiki

None

Proposed Release Note Entry

Update configuration.py for netbox 2.7.11 REDIS config

Double Check

• I have read the comments and followed the PR template.
• I have explained my PR according to the information in the comments.
• My PR targets the develop branch.

[cimnine]

Thanks for the PR. What do you think of the idea to have them both, webhooks and tasks? This way we would maintain compatibility with the rest of the 2.7 series, but be prepared for the upcoming 2.8 series.

[ryanmerolle]

I think it’s the right move. I thought about that after I pushed the PR. Are you thinking of a conditional for a deployment with a version below 2.7.11 use webhooks?

[cimnine]

To be honest, I thought of that:

REDIS = {
    'tasks': {
        'HOST': os.environ.get('REDIS_HOST', 'localhost'),
        'PORT': int(os.environ.get('REDIS_PORT', 6379)),
        'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')),
        'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)),
        'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true',
    },
    'webhooks': {
        'HOST': os.environ.get('REDIS_HOST', 'localhost'),
        'PORT': int(os.environ.get('REDIS_PORT', 6379)),
        'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')),
        'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)),
        'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true',
    },
    'caching': {
        'HOST': os.environ.get('REDIS_CACHE_HOST', os.environ.get('REDIS_HOST', 'localhost')),
        'PORT': int(os.environ.get('REDIS_CACHE_PORT', os.environ.get('REDIS_PORT', 6379))),
        'PASSWORD': os.environ.get('REDIS_CACHE_PASSWORD', os.environ.get('REDIS_PASSWORD', read_secret('redis_cache_password'))),
        'DATABASE': int(os.environ.get('REDIS_CACHE_DATABASE', 1)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_CACHE_TIMEOUT', os.environ.get('REDIS_TIMEOUT', 300))),
        'SSL': os.environ.get('REDIS_CACHE_SSL', os.environ.get('REDIS_SSL', 'False')).lower() == 'true',
    },
}

It's a lazy solution, and I have not tested it, but I expect no problems with it.

Unless you prefer a cleaner approach, would you mind giving it a try and if that works, update your PR?

[ryanmerolle]

I’ll get around to testing tomorrow or Monday and let you know. I do not think it needs to be elegant; it just needs to be readable and work.

…

On Apr 4, 2020, at 5:07 PM, Christian Mäder ***@***.***> wrote:  To be honest, I just thought of that: REDIS = { 'tasks': { 'HOST': os.environ.get('REDIS_HOST', 'localhost'), 'PORT': int(os.environ.get('REDIS_PORT', 6379)), 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), 'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)), 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', }, 'webhooks': { 'HOST': os.environ.get('REDIS_HOST', 'localhost'), 'PORT': int(os.environ.get('REDIS_PORT', 6379)), 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), 'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)), 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', }, 'caching': { 'HOST': os.environ.get('REDIS_CACHE_HOST', os.environ.get('REDIS_HOST', 'localhost')), 'PORT': int(os.environ.get('REDIS_CACHE_PORT', os.environ.get('REDIS_PORT', 6379))), 'PASSWORD': os.environ.get('REDIS_CACHE_PASSWORD', os.environ.get('REDIS_PASSWORD', read_secret('redis_cache_password'))), 'DATABASE': int(os.environ.get('REDIS_CACHE_DATABASE', 1)), 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_CACHE_TIMEOUT', os.environ.get('REDIS_TIMEOUT', 300))), 'SSL': os.environ.get('REDIS_CACHE_SSL', os.environ.get('REDIS_SSL', 'False')).lower() == 'true', }, } It's a lazy solution, and I have not tested it, but I expect no problems with it. Unless you prefer a cleaner approach, would you mind giving it a try and if that works, update your PR? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

[Freddyp91]

To be honest, I thought of that:

REDIS = {
    'tasks': {
        'HOST': os.environ.get('REDIS_HOST', 'localhost'),
        'PORT': int(os.environ.get('REDIS_PORT', 6379)),
        'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')),
        'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)),
        'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true',
    },
    'webhooks': {
        'HOST': os.environ.get('REDIS_HOST', 'localhost'),
        'PORT': int(os.environ.get('REDIS_PORT', 6379)),
        'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')),
        'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)),
        'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true',
    },
    'caching': {
        'HOST': os.environ.get('REDIS_CACHE_HOST', os.environ.get('REDIS_HOST', 'localhost')),
        'PORT': int(os.environ.get('REDIS_CACHE_PORT', os.environ.get('REDIS_PORT', 6379))),
        'PASSWORD': os.environ.get('REDIS_CACHE_PASSWORD', os.environ.get('REDIS_PASSWORD', read_secret('redis_cache_password'))),
        'DATABASE': int(os.environ.get('REDIS_CACHE_DATABASE', 1)),
        'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_CACHE_TIMEOUT', os.environ.get('REDIS_TIMEOUT', 300))),
        'SSL': os.environ.get('REDIS_CACHE_SSL', os.environ.get('REDIS_SSL', 'False')).lower() == 'true',
    },
}

It's a lazy solution, and I have not tested it, but I expect no problems with it.

Unless you prefer a cleaner approach, would you mind giving it a try and if that works, update your PR?

This worked for me thanks!
Now i need to figure out how to make this docker image use CENTOS instead of alpine.