Skip to content

Commit

Permalink
Merge pull request #1089 from mikev/master
Browse files Browse the repository at this point in the history 
fix space typo from previous configuration.rst change
  • Loading branch information
@matthewdupre
matthewdupre committed Aug 31, 2016
2 parents ac4d120 + fae033c commit a4ea4d7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions docs/source/configuration.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ The full list of parameters which can be set is as follows.
| | | OpenStack deployments, this should be set to "tap". Calico polices all traffic to/from |
| | | interfaces with this prefix. Calico blocks traffic to/from such interfaces by default. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| UsageReportingEnabled | "true" | Periodically report cluster version, hostname, size and guid to projectcalico.org. |
| | | Receive version deprecation / security warnings. |+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| UsageReportingEnabled | True | Periodically report cluster version, hostname, size and guid to projectcalico.org. |
| | | Receive version deprecation / security warnings. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| LogFilePath | /var/log/calico/felix.log | The full path to the felix log. Set to "none" to disable file logging. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| EtcdDriverLogFilePath | /var/log/calico/felix-etcd.log | Felix's etcd driver has its own log file. This parameter contains its full path. |
Expand Down Expand Up @@ -159,7 +160,7 @@ The full list of parameters which can be set is as follows.
| | | number with at least 8 bits set, none of which clash with any other mark bits in use on |
| | | the system. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| PrometheusMetricsEnabled | "false" | Set to "true" to enable the experimental Prometheus metrics server in Felix. |
| PrometheusMetricsEnabled | False | Set to True to enable the experimental Prometheus metrics server in Felix. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
| PrometheusMetricsPort | 9091 | TCP port that the Prometheus metrics server should bind to. |
+----------------------------------+---------------------------------------+-------------------------------------------------------------------------------------------+
Expand Down

0 comments on commit a4ea4d7

Please sign in to comment.