Diffusion puppet-puppet-grafana 599483f9be85

secure-json-data
599483f9be85
Actions

Description

Merge remote-tracking branch 'origin/master' into bugfix/secure-json-data

Details

Provenance

Nick Maludy <nmaludy@gmail.com>	Authored on Jan 4 2021, 7:01 PM
olasd	Pushed on Dec 28 2021, 10:47 AM

Parents

R142:8f6a53d06d84: Merge pull request #226 from treydock/types-validator
R142:5515a3a2843f: Fix whitespace linting issues

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Maludy <nmaludy@gmail.com> committed R142:599483f9be85: Merge remote-tracking branch 'origin/master' into bugfix/secure-json-data (authored by Nick Maludy <nmaludy@gmail.com>).Jan 4 2021, 7:01 PM

Merged Changes

8f6a53d06d84 Merge pull request #226 from treydock/types-validator
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
28f2f4cdfcc5 Merge pull request #224 from jsfrerot/master
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
fc0541ad5b0d Merge pull request #233 from bastelfreak/debian8
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
9687b5496d2a Allow multiple puppetsources for Grafana config
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
3eaeabcd708f Merge pull request #232 from bastelfreak/centos6
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
fab56975d0d8 Drop EoL Debian 8 support
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
83fe1ac9055e Drop Eol CentOS 6 support
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
5ac0bc64c32b Merge pull request #225 from treydock/puppetsource
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
a61581831dd1 Merge pull request #230 from voxpupuli/modulesync
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
9d1fdc895fea modulesync 4.0.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
5fb396678b0f Merge pull request #228 from voxpupuli/modulesync
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
56068d24b393 modulesync 3.1.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
f7ca9acc6f9a Merge pull request #227 from smortex/fix-puppet-generate-types
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
7af1ca4441b4 Fix `puppet generate types`
Author
Romain Tartière <romain@blogreen.org>
Browse Repository
No Builds
No Audits
322dbad915ba Ensure all API types have grafana_conn_validator autorequires
Author
Trey Dockendorf <tdockendorf@osc.edu>
Browse Repository
No Builds
No Audits
88c8009d3e52 Add unit tests around provisioning dashboards
Author
Trey Dockendorf <tdockendorf@osc.edu>
Browse Repository
No Builds
No Audits
ee21defb7dec Make puppetsource optional for dashboard provisioning
Author
Trey Dockendorf <tdockendorf@osc.edu>
Browse Repository
No Builds
No Audits
ab6cd1f1b78d Merge pull request #215 from DavidReubenWhite/master
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
ec305a4a74b4 Add acceptance testing for teams, bugfix dashboard
Author
David White <david.white@trustpower.co.nz>
Browse Repository
No Builds
No Audits
a75950ee1a65 Update examples in README.md
Author
David White <david.white@trustpower.co.nz>
Browse Repository
No Builds
No Audits
5cffa6902989 Fix bugs with teams
Author
David White <david.white@trustpower.co.nz>
Browse Repository
No Builds
No Audits
147c2ad1175d [blacksmith] Bump version to 7.0.1-rc0
Author
Martin Alfke <ma@example42.com>
Browse Repository
No Builds
No Audits
997200903690 Merge pull request #222 from tuxmea/rel/6.1.1
Author
Martin Alfke <tuxmea@users.noreply.github.com>
Browse Repository
No Builds
No Audits
14e6c8491fda Release 7.0.0
Author
Martin Alfke <ma@example42.com>
Browse Repository
No Builds
No Audits
914a5c3de6c1 Merge pull request #223 from voxpupuli/modulesync
Author
Alexander Fisher <alex@linfratech.co.uk>
Browse Repository
No Builds
No Audits
bc54d000d8d4 rubocop: autofix
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
13db7d660a62 modulesync 3.0.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
f8402a7b3ce3 Merge pull request #220 from tuxmea/sles_support
Author
Alexander Fisher <alex@linfratech.co.uk>
Browse Repository
No Builds
No Audits
d6a35dd8497c add SLES support
Author
Martin Alfke <ma@example42.com>
Browse Repository
No Builds
No Audits

Changes (53)

Path

Size

.github/

data/

family/

	Suse.yaml
	RedHat.yaml

lib/

puppet/

provider/

grafana_dashboard/

grafana.rb

grafana_team/

grafana.rb

type/

grafana_dashboard_permission.rb

grafana_ldap_config.rb

grafana_membership.rb

manifests/

spec/

acceptance/

amazonlinux-2016091.yml

windows-2016-base-x64.yml

classes/

grafana_spec.rb

grafana_dashboard_permission_type_spec.rb

grafana_membership_type_spec.rb

spec_helper.rb

spec_helper_acceptance.rb

unit/

puppet/

provider/

grafana_plugin/

grafana_cli_spec.rb

type/

grafana_dashboard_type_spec.rb

grafana_datasource_type_spec.rb

grafana_folder_type_spec.rb

grafana_ldap_config_spec.rb

grafana_ldap_group_mapping_spec.rb

grafana_ldap_server_spec.rb

grafana_notification_type_spec.rb

grafana_organization_type_spec.rb

grafana_team_type_spec.rb

grafana_user_type_spec.rb

R142:599483f9be85

View Options

.github/CONTRIBUTING.md

View Options

.github/SECURITY.md

View Options

.github/workflows/ci.yml

View Options

.github/workflows/release.yml

View Options

.msync.yml

View Options

.overcommit.yml

View Options

.pmtignore

View Options

.rubocop.yml

View Options

.sync.yml

View Options

.travis.yml

View Options

CHANGELOG.md

View Options

Gemfile

View Options

README.md

View Options

REFERENCE.md

View Options

Rakefile

View Options

data/family/Suse.yaml

View Options

lib/puppet/provider/grafana_dashboard/grafana.rb

View Options

lib/puppet/provider/grafana_team/grafana.rb

View Options

lib/puppet/type/grafana_dashboard_permission.rb

View Options

lib/puppet/type/grafana_ldap_config.rb

View Options

lib/puppet/type/grafana_membership.rb

View Options

lib/puppet/type/grafana_team.rb

View Options

manifests/config.pp

View Options

manifests/install.pp

View Options

metadata.json

View Options

spec/acceptance/class_spec.rb

View Options

spec/acceptance/grafana_team_spec.rb

View Options

spec/acceptance/nodesets

View Options

spec/acceptance/nodesets/archlinux-2-x64.yml

View Options

spec/acceptance/nodesets/ec2

View Options

spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml

View Options

spec/acceptance/nodesets/ec2/image_templates.yaml

View Options

spec/acceptance/nodesets/ec2/rhel-73-x64.yml

View Options

spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml

View Options

spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml

View Options

spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml

View Options

spec/classes/grafana_spec.rb

View Options

spec/grafana_dashboard_permission_type_spec.rb

View Options

spec/grafana_membership_type_spec.rb

View Options

spec/spec_helper.rb

View Options

spec/spec_helper_acceptance.rb

View Options

spec/unit/puppet/provider/grafana_plugin/grafana_cli_spec.rb

View Options

spec/unit/puppet/type/grafana_dashboard_type_spec.rb

View Options

spec/unit/puppet/type/grafana_datasource_type_spec.rb

View Options

spec/unit/puppet/type/grafana_folder_type_spec.rb

View Options

spec/unit/puppet/type/grafana_ldap_config_spec.rb

View Options

spec/unit/puppet/type/grafana_ldap_group_mapping_spec.rb

View Options

spec/unit/puppet/type/grafana_ldap_server_spec.rb

View Options

spec/unit/puppet/type/grafana_notification_type_spec.rb

View Options

spec/unit/puppet/type/grafana_organization_type_spec.rb

View Options

spec/unit/puppet/type/grafana_team_type_spec.rb

View Options

spec/unit/puppet/type/grafana_user_type_spec.rb

Merge remote-tracking branch 'origin/master' into bugfix/secure-json-data599483f9be85Actions

Description

Details

Event Timeline

Merged Changes

Changes (53)

R142:599483f9be85

.github/CONTRIBUTING.md

.github/SECURITY.md

.github/workflows/ci.yml

.github/workflows/release.yml

.msync.yml

.overcommit.yml

.pmtignore

.rubocop.yml

.sync.yml

.travis.yml

CHANGELOG.md

Gemfile

README.md

REFERENCE.md

Rakefile

data/family/Suse.yaml

lib/puppet/provider/grafana_dashboard/grafana.rb

lib/puppet/provider/grafana_team/grafana.rb

lib/puppet/type/grafana_dashboard_permission.rb

lib/puppet/type/grafana_ldap_config.rb

lib/puppet/type/grafana_membership.rb

lib/puppet/type/grafana_team.rb

manifests/config.pp

manifests/install.pp

metadata.json

spec/acceptance/class_spec.rb

spec/acceptance/grafana_team_spec.rb

spec/acceptance/nodesets

spec/acceptance/nodesets/archlinux-2-x64.yml

spec/acceptance/nodesets/ec2

spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml

spec/acceptance/nodesets/ec2/image_templates.yaml

spec/acceptance/nodesets/ec2/rhel-73-x64.yml

spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml

spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml

spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml

spec/classes/grafana_spec.rb

spec/grafana_dashboard_permission_type_spec.rb

spec/grafana_membership_type_spec.rb

spec/spec_helper.rb

spec/spec_helper_acceptance.rb

spec/unit/puppet/provider/grafana_plugin/grafana_cli_spec.rb

spec/unit/puppet/type/grafana_dashboard_type_spec.rb

spec/unit/puppet/type/grafana_datasource_type_spec.rb

spec/unit/puppet/type/grafana_folder_type_spec.rb

spec/unit/puppet/type/grafana_ldap_config_spec.rb

spec/unit/puppet/type/grafana_ldap_group_mapping_spec.rb

spec/unit/puppet/type/grafana_ldap_server_spec.rb

spec/unit/puppet/type/grafana_notification_type_spec.rb

spec/unit/puppet/type/grafana_organization_type_spec.rb

spec/unit/puppet/type/grafana_team_type_spec.rb

spec/unit/puppet/type/grafana_user_type_spec.rb

Merge remote-tracking branch 'origin/master' into bugfix/secure-json-data
599483f9be85
Actions