Skip to content

separate check and report clusters #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
163 changes: 92 additions & 71 deletions mesh/v1alpha1/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 23 additions & 9 deletions mesh/v1alpha1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,25 @@ message ProxyConfig {
// MeshConfig defines mesh-wide variables shared by all Envoy instances in the
// Istio service mesh.
message MeshConfig {
// Address of the egress Envoy service (e.g. _istio-egress:80_).
string egress_proxy_address = 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is egress_proxy_address being removed as part of the mixer_address separation?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah shux.. It was an unused config item.. We got rid of egress proxy a long time ago. Thought I would remove it as well.


// Address of the mixer service (e.g. _istio-mixer:15004_).
// Empty value disables Mixer checks and telemetry.
string mixer_address = 2;

// Disable policy checks by the mixer service. Metrics will still be
// reported to the mixer for HTTP requests and TCP connections. Default
// Address of the server that will be used by the proxies for policy
// check calls (e.g. _istio-mixer:15004_). By using different names for
// mixerCheckServer and mixerReportServer, it is possible to have one set
// of mixer servers handle policy check calls, while another set of mixer
// servers handle telemetry calls.
//
// NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
// equivalent to setting disablePolicyChecks to true.
string mixer_check_server = 1;

// Address of the server that will be used by the proxies as an Istio
// telemetry sink (access logs, API/connection metrics)
// (e.g. _istio-mixer:15004_). By using different names for
// mixerCheckServer and mixerReportServer, it is possible to have one set
// of mixer servers handle policy check calls, while another set of mixer
// servers handle telemetry calls.
string mixer_report_server = 2;

// Disable policy checks by the mixer service. Default
// is false, i.e. mixer policy check is enabled by default.
bool disable_policy_checks = 3;

Expand Down Expand Up @@ -208,4 +218,8 @@ message MeshConfig {
// DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
// Instead, use service-level annotations to overwrite the authentication policy.
repeated string mtls_excluded_services = 15;

// DEPRECATED. Mixer address. This option will be removed soon. Please
// use mixer_check_server and mixer_report_server.
string mixer_address = 16;
}
37 changes: 28 additions & 9 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,39 @@ <h2 id="MeshConfig">MeshConfig</h2>
</tr>
</thead>
<tbody>
<tr id="MeshConfig.egress_proxy_address">
<td><code>egressProxyAddress</code></td>
<tr id="MeshConfig.mixer_check_server">
<td><code>mixerCheckServer</code></td>
<td><code>string</code></td>
<td>
<p>Address of the egress Envoy service (e.g. <em>istio-egress:80</em>).</p>
<p>Address of the server that will be used by the proxies for policy
check calls (e.g. <em>istio-mixer:15004</em>). By using different names for
mixerCheckServer and mixerReportServer, it is possible to have one set
of mixer servers handle policy check calls, while another set of mixer
servers handle telemetry calls.</p>

<p>NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
equivalent to setting disablePolicyChecks to true.</p>

</td>
</tr>
<tr id="MeshConfig.mixer_address">
<td><code>mixerAddress</code></td>
<tr id="MeshConfig.mixer_report_server">
<td><code>mixerReportServer</code></td>
<td><code>string</code></td>
<td>
<p>Address of the mixer service (e.g. <em>istio-mixer:15004</em>).
Empty value disables Mixer checks and telemetry.</p>
<p>Address of the server that will be used by the proxies as an Istio
telemetry sink (access logs, API/connection metrics)
(e.g. <em>istio-mixer:15004</em>). By using different names for
mixerCheckServer and mixerReportServer, it is possible to have one set
of mixer servers handle policy check calls, while another set of mixer
servers handle telemetry calls.</p>

</td>
</tr>
<tr id="MeshConfig.disable_policy_checks">
<td><code>disablePolicyChecks</code></td>
<td><code>bool</code></td>
<td>
<p>Disable policy checks by the mixer service. Metrics will still be
reported to the mixer for HTTP requests and TCP connections. Default
<p>Disable policy checks by the mixer service. Default
is false, i.e. mixer policy check is enabled by default.</p>

</td>
Expand Down Expand Up @@ -197,6 +207,15 @@ <h2 id="MeshConfig">MeshConfig</h2>
DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
Instead, use service-level annotations to overwrite the authentication policy.</p>

</td>
</tr>
<tr id="MeshConfig.mixer_address">
<td><code>mixerAddress</code></td>
<td><code>string</code></td>
<td>
<p>DEPRECATED. Mixer address. This option will be removed soon. Please
use mixer<em>check</em>server and mixer<em>report</em>server.</p>

</td>
</tr>
</tbody>
Expand Down