feat: add --time flag to status command, storage tier display, and multi-provider improvements

.gitignore

@@ -97,3 +97,4 @@ Thumbs.db
 *.local
 .env.local
 deepfreeze-blog-post.md
+examples/config.yml

README.md

@@ -28,13 +28,23 @@ pip install git+https://github.com/elastic/deepfreeze.git#subdirectory=packages/
 
 [View deepfreeze-cli documentation](packages/deepfreeze-cli/README.md)
 
+## Supported Cloud Providers
+
+Deepfreeze supports multiple cloud storage providers:
+
+| Provider | Storage Type | Archive Tier |
+|----------|--------------|--------------|
+| **AWS** | S3 | Glacier, Glacier Deep Archive |
+| **Azure** | Blob Storage | Archive tier |
+| **GCP** | Cloud Storage | Archive storage class |
+
 ## Features
 
-- **Setup**: Configure ILM policies, index templates, and S3 buckets for deepfreeze
+- **Setup**: Configure ILM policies, index templates, and storage buckets for deepfreeze
 - **Rotate**: Create new snapshot repositories on a schedule (weekly/monthly/yearly)
 - **Status**: View the current state of all deepfreeze components
-- **Thaw**: Restore data from Glacier for analysis
-- **Refreeze**: Return thawed data to Glacier storage
+- **Thaw**: Restore data from archive storage for analysis
+- **Refreeze**: Return thawed data to archive storage
 - **Cleanup**: Remove expired thaw requests and associated resources
 - **Repair Metadata**: Fix inconsistencies in the deepfreeze status index
 
@@ -53,11 +63,22 @@ pip install git+https://github.com/elastic/deepfreeze.git#subdirectory=packages/
      username: elastic
      password: changeme
 
-   deepfreeze:
-     provider: aws
-     bucket_name_prefix: my-deepfreeze
-     repo_name_prefix: deepfreeze
-     rotate_by: week
+   # Storage provider credentials (optional - can also use environment variables)
+   storage:
+     # AWS S3
+     aws:
+       region: us-east-1
+       # profile: my-profile  # Or use access_key_id + secret_access_key
+
+     # Azure Blob Storage
+     azure:
+       connection_string: "DefaultEndpointsProtocol=https;AccountName=...;AccountKey=..."
+       # Or use account_name + account_key
+
+     # Google Cloud Storage
+     gcp:
+       project: my-gcp-project
+       credentials_file: /path/to/service-account.json
    ```
 
 3. Initialize deepfreeze:

packages/deepfreeze-cli/README.md

@@ -1,14 +1,22 @@
 # Deepfreeze
 
-Standalone Elasticsearch S3 Glacier archival and lifecycle management tool.
+Standalone Elasticsearch cloud storage archival and lifecycle management tool.
 
 ## Overview
 
-Deepfreeze provides cost-effective S3 Glacier archival and lifecycle management for Elasticsearch snapshot repositories without requiring full Curator installation. It is a lightweight, focused tool for managing long-term data retention in AWS S3 Glacier storage.
+Deepfreeze provides cost-effective cloud storage archival and lifecycle management for Elasticsearch snapshot repositories without requiring full Curator installation. It is a lightweight, focused tool for managing long-term data retention in cloud archive storage.
+
+## Supported Cloud Providers
+
+| Provider | Storage Type | Archive Tier |
+|----------|--------------|--------------|
+| **AWS** | S3 | Glacier, Glacier Deep Archive |
+| **Azure** | Blob Storage | Archive tier |
+| **GCP** | Cloud Storage | Archive storage class |
 
 ## Features
 
-- S3 Glacier archival for Elasticsearch snapshot repositories
+- Cloud archive storage for Elasticsearch snapshot repositories
 - Repository rotation with configurable retention
 - Thaw frozen repositories for data retrieval
 - Automatic refreeze after data access
@@ -52,14 +60,20 @@ deepfreeze --help
 
 - Python 3.8 or higher
 - Elasticsearch 8.x cluster
-- AWS credentials configured (for S3 access)
+- Cloud provider credentials (one of):
+  - **AWS**: AWS credentials via environment, config file, or IAM role
+  - **Azure**: Connection string or account name + key
+  - **GCP**: Application Default Credentials or service account JSON
 - Required Python packages (installed automatically):
   - elasticsearch8
-  - boto3
+  - boto3 (for AWS)
   - click
   - rich
   - voluptuous
   - pyyaml
+- Optional packages for additional providers:
+  - azure-storage-blob (for Azure): `pip install deepfreeze-cli[azure]`
+  - google-cloud-storage (for GCP): `pip install deepfreeze-cli[gcp]`
 
 ## Configuration
 
@@ -88,7 +102,7 @@ vim ~/.deepfreeze/config.yml
 
 ### Configuration Format
 
-Create a YAML configuration file to specify Elasticsearch connection settings:
+Create a YAML configuration file to specify Elasticsearch connection and storage provider settings:
 
 ```yaml
 elasticsearch:
@@ -103,6 +117,29 @@ elasticsearch:
   # Or use Elastic Cloud
   # cloud_id: deployment:base64string
 
+# Storage provider credentials (optional - can also use environment variables)
+storage:
+  # AWS S3 configuration
+  aws:
+    region: us-east-1
+    # profile: my-profile  # Use named profile from ~/.aws/credentials
+    # Or explicit credentials:
+    # access_key_id: AKIA...
+    # secret_access_key: ...
+
+  # Azure Blob Storage configuration
+  azure:
+    connection_string: "DefaultEndpointsProtocol=https;AccountName=...;AccountKey=..."
+    # Or use account name + key:
+    # account_name: mystorageaccount
+    # account_key: ...
+
+  # Google Cloud Storage configuration
+  gcp:
+    project: my-gcp-project
+    credentials_file: /path/to/service-account.json
+    location: US
+
 logging:
   loglevel: INFO
   # logfile: /var/log/deepfreeze.log
@@ -112,13 +149,30 @@ logging:
 
 Configuration can also be provided via environment variables:
 
+**Elasticsearch:**
 - `DEEPFREEZE_ES_HOSTS` - Elasticsearch hosts (comma-separated)
 - `DEEPFREEZE_ES_USERNAME` - Elasticsearch username
 - `DEEPFREEZE_ES_PASSWORD` - Elasticsearch password
 - `DEEPFREEZE_ES_API_KEY` - Elasticsearch API key
 - `DEEPFREEZE_ES_CLOUD_ID` - Elastic Cloud ID
 
-Environment variables override file configuration.
+**AWS S3:**
+- `AWS_ACCESS_KEY_ID` - AWS access key
+- `AWS_SECRET_ACCESS_KEY` - AWS secret key
+- `AWS_DEFAULT_REGION` - AWS region
+- `AWS_PROFILE` - AWS profile name
+
+**Azure Blob Storage:**
+- `AZURE_STORAGE_CONNECTION_STRING` - Full connection string
+- `AZURE_STORAGE_ACCOUNT` - Storage account name (with AZURE_STORAGE_KEY)
+- `AZURE_STORAGE_KEY` - Storage account key
+
+**Google Cloud Storage:**
+- `GOOGLE_APPLICATION_CREDENTIALS` - Path to service account JSON
+- `GOOGLE_CLOUD_PROJECT` - GCP project ID
+- `GOOGLE_CLOUD_LOCATION` - Default bucket location
+
+Environment variables are used as fallback when config file credentials are not provided.
 
 ## Usage
 
@@ -127,11 +181,26 @@ Environment variables override file configuration.
 Set up deepfreeze with ILM policy and index template configuration:
 
 ```bash
+# AWS (default)
 deepfreeze --config config.yaml setup \
   --ilm_policy_name my-ilm-policy \
   --index_template_name my-template \
   --bucket_name_prefix my-deepfreeze \
   --repo_name_prefix my-deepfreeze
+
+# Azure
+deepfreeze --config config.yaml setup \
+  --provider azure \
+  --ilm_policy_name my-ilm-policy \
+  --bucket_name_prefix my-deepfreeze \
+  --repo_name_prefix my-deepfreeze
+
+# GCP
+deepfreeze --config config.yaml setup \
+  --provider gcp \
+  --ilm_policy_name my-ilm-policy \
+  --bucket_name_prefix my-deepfreeze \
+  --repo_name_prefix my-deepfreeze
 ```
 
 ### Check Status
@@ -216,11 +285,11 @@ deepfreeze --config config.yaml --dry-run repair-metadata
 
 | Command | Description |
 |---------|-------------|
-| `setup` | Initialize deepfreeze environment |
+| `setup` | Initialize deepfreeze environment (supports `--provider` option) |
 | `status` | Show current status of repositories and requests |
 | `rotate` | Create new repository and archive old ones |
-| `thaw` | Initiate or check Glacier restore operations |
-| `refreeze` | Return thawed repositories to Glacier |
+| `thaw` | Initiate or check archive restore operations |
+| `refreeze` | Return thawed repositories to archive storage |
 | `cleanup` | Remove expired repositories and old requests |
 | `repair-metadata` | Scan and repair metadata discrepancies |
 

packages/deepfreeze-cli/deepfreeze/cli/main.py

@@ -203,15 +203,9 @@ def cli(ctx, config_path, dry_run):
 @click.option(
     "-o",
     "--provider",
-    type=click.Choice(
-        [
-            "aws",
-            # "gcp",
-            # "azure",
-        ]
-    ),
+    type=click.Choice(["aws", "azure", "gcp"]),
     default="aws",
-    help="What provider to use (AWS only for now)",
+    help="Cloud storage provider to use (aws, azure, or gcp)",
 )
 @click.option(
     "-t",
@@ -306,6 +300,42 @@ def setup(
 
     client = get_client_from_context(ctx)
 
+    # Azure container names don't allow underscores - offer to convert them
+    if provider == "azure":
+        names_to_check = {
+            "bucket_name_prefix": bucket_name_prefix,
+            "repo_name_prefix": repo_name_prefix,
+            "base_path_prefix": base_path_prefix,
+        }
+        names_with_underscores = {
+            name: value
+            for name, value in names_to_check.items()
+            if value and "_" in value
+        }
+        if names_with_underscores:
+            converted = {
+                name: value.replace("_", "-")
+                for name, value in names_with_underscores.items()
+            }
+            click.echo(
+                "Azure container names cannot contain underscores. "
+                "The following names would be converted:"
+            )
+            for name, value in names_with_underscores.items():
+                click.echo(f"  {name}: {value} -> {converted[name]}")
+
+            if not click.confirm("Do you want to proceed with these converted names?"):
+                click.echo("Aborted. Please provide names without underscores.")
+                ctx.exit(1)
+
+            # Apply conversions
+            if "bucket_name_prefix" in converted:
+                bucket_name_prefix = converted["bucket_name_prefix"]
+            if "repo_name_prefix" in converted:
+                repo_name_prefix = converted["repo_name_prefix"]
+            if "base_path_prefix" in converted:
+                base_path_prefix = converted["base_path_prefix"]
+
     action = Setup(
         client=client,
         year=year,
@@ -448,6 +478,14 @@ def rotate(
     default=False,
     help="Output plain text without formatting (suitable for scripting)",
 )
+@click.option(
+    "-rt",
+    "--time",
+    "show_time",
+    is_flag=True,
+    default=False,
+    help="Show full date+time in tables",
+)
 @click.pass_context
 def status(
     ctx,
@@ -458,6 +496,7 @@ def status(
     ilm,
     show_config_flag,
     porcelain,
+    show_time,
 ):
     """
     Show the status of deepfreeze
@@ -479,6 +518,7 @@ def status(
         show_buckets=buckets,
         show_ilm=ilm,
         show_config=show_config_flag,
+        show_time=show_time,
     )
 
     try:

packages/deepfreeze-cli/deepfreeze/defaults/__init__.py

@@ -125,7 +125,7 @@ def provider():
     """
     Cloud provider for deepfreeze.
     """
-    return {Optional("provider", default="aws"): Any("aws")}
+    return {Optional("provider", default="aws"): Any("aws", "azure", "gcp")}
 
 
 def rotate_by():