Remove rsyslog to gather logs

sinanawad · Jan 21, 2016 · 189ad12 · 189ad12
1 parent c453510
commit 189ad12
Show file tree

Hide file tree

Showing 47 changed files with 33 additions and 5,243 deletions.
diff --git a/api/environmentmanager/environmentmanager_test.go b/api/environmentmanager/environmentmanager_test.go
@@ -46,11 +46,10 @@ func (s *environmentmanagerSuite) TestConfigSkeleton(c *gc.C) {
 
 	// Numbers coming over the api are floats, not ints.
 	c.Assert(result, jc.DeepEquals, params.EnvironConfig{
-		"type":        "dummy",
-		"ca-cert":     coretesting.CACert,
-		"state-port":  float64(1234),
-		"api-port":    float64(apiPort),
-		"syslog-port": float64(2345),
+		"type":       "dummy",
+		"ca-cert":    coretesting.CACert,
+		"state-port": float64(1234),
+		"api-port":   float64(apiPort),
 	})
 
 }

diff --git a/api/facadeversions.go b/api/facadeversions.go
@@ -51,7 +51,6 @@ var facadeVersions = map[string]int{
 	"Reboot":                       1,
 	"RelationUnitsWatcher":         0,
 	"Resumer":                      1,
-	"Rsyslog":                      0,
 	"Service":                      2,
 	"Storage":                      1,
 	"Spaces":                       1,

diff --git a/api/interface.go b/api/interface.go
@@ -27,7 +27,6 @@ import (
 	"github.com/juju/juju/api/provisioner"
 	"github.com/juju/juju/api/reboot"
 	"github.com/juju/juju/api/resumer"
-	"github.com/juju/juju/api/rsyslog"
 	"github.com/juju/juju/api/storageprovisioner"
 	"github.com/juju/juju/api/unitassigner"
 	"github.com/juju/juju/api/uniter"
@@ -181,7 +180,6 @@ type Connection interface {
 	InstancePoller() *instancepoller.API
 	CharmRevisionUpdater() *charmrevisionupdater.State
 	Cleaner() *cleaner.API
-	Rsyslog() *rsyslog.State
 	MetadataUpdater() *imagemetadata.Client
 	UnitAssigner() unitassigner.API
 }
diff --git a/api/rsyslog/package_test.go b/api/rsyslog/package_test.go
diff --git a/api/rsyslog/rsyslog.go b/api/rsyslog/rsyslog.go
diff --git a/api/rsyslog/rsyslog_test.go b/api/rsyslog/rsyslog_test.go
diff --git a/api/state.go b/api/state.go
@@ -29,7 +29,6 @@ import (
 	"github.com/juju/juju/api/provisioner"
 	"github.com/juju/juju/api/reboot"
 	"github.com/juju/juju/api/resumer"
-	"github.com/juju/juju/api/rsyslog"
 	"github.com/juju/juju/api/storageprovisioner"
 	"github.com/juju/juju/api/unitassigner"
 	"github.com/juju/juju/api/uniter"
@@ -397,11 +396,6 @@ func (st *state) Cleaner() *cleaner.API {
 	return cleaner.NewAPI(st)
 }
 
-// Rsyslog returns access to the Rsyslog API
-func (st *state) Rsyslog() *rsyslog.State {
-	return rsyslog.NewState(st)
-}
-
 // ServerVersion holds the version of the API server that we are connected to.
 // It is possible that this version is Zero if the server does not report this
 // during login. The second result argument indicates if the version number is

diff --git a/api/state_macaroon_test.go b/api/state_macaroon_test.go
@@ -107,8 +107,7 @@ func (s *macaroonLoginSuite) TestConnectStreamFailedDischarge(c *gc.C) {
 	// Ensure that the discharger won't discharge and try
 	// logging in again. We should succeed in getting past
 	// authorization because we have the cookies (but
-	// the actual debug-log endpoint will return an error
-	// because there's no all-machines.log file).
+	// the actual debug-log endpoint will return an error).
 	dischargeError = true
 	logArgs := url.Values{"noTail": []string{"true"}}
 	conn, err := client.ConnectStream("/log", logArgs)

diff --git a/apiserver/allfacades.go b/apiserver/allfacades.go
@@ -38,7 +38,6 @@ import (
 	_ "github.com/juju/juju/apiserver/provisioner"
 	_ "github.com/juju/juju/apiserver/reboot"
 	_ "github.com/juju/juju/apiserver/resumer"
-	_ "github.com/juju/juju/apiserver/rsyslog"
 	_ "github.com/juju/juju/apiserver/service"
 	_ "github.com/juju/juju/apiserver/spaces"
 	_ "github.com/juju/juju/apiserver/statushistory"

diff --git a/apiserver/environmentmanager/environmentmanager.go b/apiserver/environmentmanager/environmentmanager.go
@@ -99,9 +99,6 @@ var configValuesFromStateServer = []string{
 	"ca-cert",
 	"state-port",
 	"api-port",
-	"syslog-port",
-	"rsyslog-ca-cert",
-	"rsyslog-ca-key",
 }
 
 // ConfigSkeleton returns config values to be used as a starting point for the

diff --git a/apiserver/environmentmanager/environmentmanager_test.go b/apiserver/environmentmanager/environmentmanager_test.go
@@ -141,36 +141,36 @@ func (s *envManagerSuite) TestRestrictedProviderFields(c *gc.C) {
 		{
 			provider: "azure",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key",
+				"type", "ca-cert", "state-port", "api-port",
 				"subscription-id", "tenant-id", "application-id", "application-password", "location",
 				"controller-resource-group", "storage-account-type"},
 		}, {
 			provider: "dummy",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key"},
+				"type", "ca-cert", "state-port", "api-port"},
 		}, {
 			provider: "joyent",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key"},
+				"type", "ca-cert", "state-port", "api-port"},
 		}, {
 			provider: "local",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key",
+				"type", "ca-cert", "state-port", "api-port",
 				"container", "network-bridge", "root-dir", "proxy-ssh"},
 		}, {
 			provider: "maas",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key",
+				"type", "ca-cert", "state-port", "api-port",
 				"maas-server"},
 		}, {
 			provider: "openstack",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key",
+				"type", "ca-cert", "state-port", "api-port",
 				"region", "auth-url", "auth-mode"},
 		}, {
 			provider: "ec2",
 			expected: []string{
-				"type", "ca-cert", "state-port", "api-port", "syslog-port", "rsyslog-ca-cert", "rsyslog-ca-key",
+				"type", "ca-cert", "state-port", "api-port",
 				"region"},
 		},
 	} {
@@ -199,11 +199,10 @@ func (s *envManagerSuite) TestConfigSkeleton(c *gc.C) {
 	apiPort := s.Environ.Config().APIPort()
 
 	c.Assert(skeleton.Config, jc.DeepEquals, params.EnvironConfig{
-		"type":        "dummy",
-		"ca-cert":     coretesting.CACert,
-		"state-port":  1234,
-		"api-port":    apiPort,
-		"syslog-port": 2345,
+		"type":       "dummy",
+		"ca-cert":    coretesting.CACert,
+		"state-port": 1234,
+		"api-port":   apiPort,
 	})
 }
 
@@ -245,18 +244,6 @@ func (s *envManagerSuite) TestCreateEnvironmentBadConfig(c *gc.C) {
 			key:      "api-port",
 			value:    123,
 			errMatch: `specified api-port "123" does not match apiserver ".*"`,
-		}, {
-			key:      "syslog-port",
-			value:    1234,
-			errMatch: `specified syslog-port "1234" does not match apiserver "2345"`,
-		}, {
-			key:      "rsyslog-ca-cert",
-			value:    "some-cert",
-			errMatch: `specified rsyslog-ca-cert "some-cert" does not match apiserver ".*"`,
-		}, {
-			key:      "rsyslog-ca-key",
-			value:    "some-key",
-			errMatch: `specified rsyslog-ca-key "some-key" does not match apiserver ".*"`,
 		},
 	} {
 		c.Logf("%d: %s", i, test.key)

diff --git a/apiserver/params/params.go b/apiserver/params/params.go
@@ -537,30 +537,6 @@ type DeployerConnectionValues struct {
 	APIAddresses   []string
 }
 
-// SetRsyslogCertParams holds parameters for the SetRsyslogCert call.
-type SetRsyslogCertParams struct {
-	CACert []byte
-	CAKey  []byte
-}
-
-// RsyslogConfigResult holds the result of a GetRsyslogConfig call.
-type RsyslogConfigResult struct {
-	Error  *Error `json:"Error"`
-	CACert string `json:"CACert"`
-	CAKey  string `json:"CAKey"`
-	// Port is only used by state servers as the port to listen on.
-	// Clients should use HostPorts for the rsyslog addresses to forward
-	// logs to.
-	Port int `json:"Port"`
-
-	HostPorts []HostPort `json:"HostPorts"`
-}
-
-// RsyslogConfigResults is the bulk form of RyslogConfigResult
-type RsyslogConfigResults struct {
-	Results []RsyslogConfigResult
-}
-
 // JobsResult holds the jobs for a machine that are returned by a call to Jobs.
 type JobsResult struct {
 	Jobs  []multiwatcher.MachineJob `json:"Jobs"`