diff --git a/lib/puppet/type/grafana_conn_validator.rb b/lib/puppet/type/grafana_conn_validator.rb index 958c67e..48a35c6 100644 --- a/lib/puppet/type/grafana_conn_validator.rb +++ b/lib/puppet/type/grafana_conn_validator.rb @@ -1,37 +1,37 @@ Puppet::Type.newtype(:grafana_conn_validator) do desc <<-DESC Verify connectivity to the Grafana API DESC ensurable newparam(:name, namevar: true) do desc 'Arbitrary name of this resource' end newparam(:grafana_url) do desc 'The URL of the Grafana server' defaultto 'http://localhost:3000' validate do |value| unless value =~ %r{^https?://} raise ArgumentError, format('%s is not a valid URL', value) end end end newparam(:grafana_api_path) do desc 'The absolute path to the API endpoint' defaultto '/api/health' validate do |value| - unless value =~ %r{^/.*/?api$} + unless value =~ %r{^/.*/?api/.*$} raise ArgumentError, format('%s is not a valid API path', value) end end end autorequire(:service) do 'grafana-server' end end