Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

bump up dependencies #409

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bump up dependencies #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a03379a
bump up dependencies
anesterova Jun 16, 2022
f7a9c1a
TO-16285: increase fetch timeout in graphite for big queries
yuriymalygin Aug 8, 2023
1f92641
TO-16285: move timeout settings to general section
yuriymalygin Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.1 < 7.0.0"
"version_requirement": ">= 4.13.1 < 9.0.0"
}
],
"operatingsystem_support": [
Expand Down
5 changes: 3 additions & 2 deletions templates/opt/graphite/webapp/graphite/local_settings.py.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ CACHES = {
URL_PREFIX = "<%= scope.lookupvar('graphite::gr_web_url_prefix') %>"
<% end -%>

FETCH_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_fetch_timeout') %>
FIND_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_find_timeout') %>

#####################################
# Filesystem Paths #
#####################################
Expand Down Expand Up @@ -241,8 +244,6 @@ CLUSTER_SERVERS = ['<%= scope.lookupvar('graphite::gr_cluster_servers').join("',
# Remote cluster settings config names changed in Graphite 1.0.
# See https://github.com/echocat/puppet-graphite/pull/356 for more info
<% if scope.lookupvar('graphite::version_1') >= 0 %>
REMOTE_FETCH_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_fetch_timeout') %>
REMOTE_FIND_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_find_timeout') %>
REMOTE_RETRY_DELAY = <%= scope.lookupvar('graphite::gr_cluster_retry_delay') %>
FIND_CACHE_DURATION = <%= scope.lookupvar('graphite::gr_cluster_cache_duration') %>
<% else %>
Expand Down