Skip to content

Commit

Permalink
Revert "Allow to remove node['grafana']['datasources'] defaults via…
Browse files Browse the repository at this point in the history
… roles (fixes #27)"

This reverts commit 846d47e.
  • Loading branch information
JonathanTron committed Nov 14, 2014
1 parent 846d47e commit 7d5f7f4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 38 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

This file is used to list changes made in each version of grafana.

## Dev:

* Allow removing `node['grafana']['datasources']` defaults via roles attributes
only by setting values to `nil`. [#27](https://github.com/JonathanTron/chef-grafana/issues/27)

## 1.5.2:

* Allow configuration of `default_route` via attributes (Miguel Landaeta) [#26](https://github.com/JonathanTron/chef-grafana/pull/26)
Expand Down
32 changes: 0 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,38 +80,6 @@ to know about the multiple databases it should read data from (`elasticsearch`,
}
```

If you're trying to set values via roles, beware of chef's attributes merging.
To get rid of `graphite` you would have to set the value to `nil` (or `null`
if using json's role).

As `ruby`:

```ruby
name "myrole"
override_attributes({
"grafana" => {
"datasources" => {
"graphite" => nil
}
}
})
```

as `json`:

```json
{
"name": "myrole",
"override_attributes": {
"grafana": {
"datasources": {
"graphite": null
}
}
}
}
```

#### kibana::nginx

| Attribute | Default | Description |
Expand Down
1 change: 0 additions & 1 deletion libraries/javascript_pp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ def self.pprint(obj, indent=1)
when Hash
res = "{\n"
obj.each do |k,v|
next if v.nil?
res += ' ' * indent
res += k.to_s + ': '
res += pprint(v, indent+1)
Expand Down

0 comments on commit 7d5f7f4

Please sign in to comment.